Bug 1071105 - On validation just print commit timestamp
Merge pull request #4930 from jwhonce/bug/1071105

Merged by openshift-bot
Merge pull request #4927 from abhgupta/abhgupta-dev

Merged by openshift-bot
Speeding up tests
Merge pull request #4931 from danmcp/master

Merged by openshift-bot
Fix formatting
Merge pull request #4932 from danmcp/master

Merged by openshift-bot
Bug 1053485 - Changing GID_MIN in login.defs prevents app creation

This patch was originally submitted by Josep 'Pep' Turro Mauri <pep@redhat.com>
Bug 1075221 - Prevent mcollective and watchman restart after logrotate
Turn off direct addressing
Bug 1075221 - Prevent node-web-proxy being restarted by logrotate
Merge pull request #4938 from danmcp/master

Merged by openshift-bot
Merge pull request #4937 from mfojtik/bugzilla/1075221

Merged by openshift-bot
Merge pull request #4940 from mfojtik/bugzilla/1075221_2

Merged by openshift-bot
vhost-plugin: remove keepalive=On for now
Stop using direct addressing
Merge pull request #4941 from danmcp/master

Merged by openshift-bot
Bug 1075673 - Unable to perform git deploy after binary deployment

After doing a successful binary deployment, the node is unable to
process a git deployment
Merge pull request #4850 from vbatts/408-3-rewrite_to_proxypass

Merged by openshift-bot
Add support for multiple platforms in OpenShift.
Changes span both the broker and the node.

Add a setting named 'NODE_PLATFORMS' to broker.conf.
Add an optional attribute named 'platform' to cartridge manifests.
Add an optional 'Required' attribute for the 'Scaling' key to cartridge manifest.

Broker queries nodes of all platforms when building its cartridge cache.
Broker does not allow group overrides for cartridges of different platforms.
Broker uses the cartridge platform to filter nodes based on the 'kernel' fact.

Node handles the case when a web proxy cartridge is not collocated with a web cartridge.

Modify tests to take new logic into account.
Add tests to cover new code paths.