Bug 989276 - Check for existence of ROOT.war before attempting to copy it
Merge branch 'master' of https://github.com/openshift/origin-server into bugzilla/989276
Bug 1007455 - Added primary_cartridge methods to Ruby SDK
Added OpenShift::Cartridge::Sdk namespace and removed TODO
Card origin_runtime_255: Publish district uid limits to nodes

    https://trello.com/c/cedK4ySU

    Add facts for district_first_uid and district_max_uid

    Update set_district mcollective action to record first_uid and
    max_uid

    Add set_district_uid_limits mcollective action to update first_uid
    and max_uid or add them if they do not already exist

    Update district model to update first_uid and max_uid when a node is
    added, removed, activated, deactivated or if the capactiy for a
    district is modified.

    Update oo-accept-node to use district_first_uid and district_max_uid
    facts instead of GEAR_MIN_UID and GEAR_MAX_UID on a district node.

    Add flock around editing district.info

    Move runtime district info cucumber test from private repo

    Update runtime district info cucumber test for first_uid and max_uid

    Add publish-uids command to oo-admin-ctl-district
RHBZ#1005307 refactor oo-restorecon to accept files as arguments
node-util: extend the oo-restorecon man pages
Merge pull request #3687 from mmahut/mmahut/oo_restorecon

Merged by openshift-bot
Merge pull request #3659 from mfojtik/bugzilla/1007455

Merged by openshift-bot
Allow for version 4.0.x of haml gem to be used
Bug 1011459 - oo-last-access does not process node-web-proxy/websockets.log

* Use access.log format for websockets.log
* Add websockets.log processing to oo-last-access
<README.auth_plugin.md> Fixed typo
endpoints included for rest call to gear_groups
Merge pull request #3694 from dobbymoodge/typo_fix

Merged by openshift-bot
Fedora 19 comes with NodeJS 0.10.Remove scl call from service file.
* remove debugging output from log
Bug 1010047 - The http configuration was also needed for an alias with an SSL cert since we get rid of the ServerAlias record for it.
Fix rhc command in not scalable help text
Bug 1008638 - The create step is needed on vhost and other plugins.
Merge pull request #3647 from detiber/runtime_card_255

Merged by openshift-bot