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
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
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
Fix rhc command in not scalable help text
Merge pull request #3647 from detiber/runtime_card_255

Merged by openshift-bot
Merge pull request #3692 from jwforres/update_haml_version

Merged by openshift-bot
Merge pull request #3696 from rajatchopra/master

Merged by openshift-bot
Merge pull request #3695 from jwhonce/wip/idle_websockets

Merged by openshift-bot
Bug 1010461 - Increase supervisor poll_interval

* Increase default supervisor poll_interval to reduce resource usage
Automatic commit of package [openshift-origin-broker-util] release [1.15.2-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.15.2-1].
Automatic commit of package [openshift-origin-node-util] release [1.15.2-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [1.15.3-1].