Bug 1139280 - Allow postgresql upgrade to pass when data/ was erased by user
Bug 1135941 - Finish setup for 10gen cartridge when the agent code is missing.
o-a-c-team: typo per bug 1141848

https://bugzilla.redhat.com/show_bug.cgi?id=1141848
Merge pull request #5812 from sosiouxme/bz1141848

Merged by openshift-bot
Merge pull request #5811 from mfojtik/bz1135941

Merged by openshift-bot
Updated documentation about pg_hba.conf
Merge pull request #5810 from mfojtik/bz1139280

Merged by openshift-bot
Watchman filters out haproxy/logshifter

Make Watchman's GearStatePlugin filter out haproxy and logshifter
related processes so it can better determine when to start a gear whose
processes have died.

Bug 1133629
gear-placement plugin: improve docs and examples

Noted clearly how server_infos are filtered prior to invoking the plugin
method. Also revised the examples to add logging, adjust idiom, etc.
Changes first_steps links to developer portal
Merge pull request #5808 from sosiouxme/gear-placement

Merged by openshift-bot
mysql cart: simplify user env var check

Eliminate the "`-n`" test for `OPENSHIFT_MYSQL_START_TIMEOUT` (and
...`_STOP_TIMEOUT`) and replace it with the `set -u` safe
`${OPENSHIFT_MYSQL_START_TIMEOUT:-}` expansion
Merge pull request #5815 from spurtell/master

Merged by openshift-bot
Multiple bug fixes
 - Bug 1108556: incorrect layout in oo-admin-ctl-domain man page
 - Bug 1117643: Missing '--allowed_gear_sizes' option in help of oo-admin-ctl-domain
 - Bug 1112455: Should give proper info when the same addon cartridges added to one application
 - Bug 1112636: zend-5.6 should be removed from warning message when try to create an app using invalid download cartridge
 - Bug 1109647: Loss of alias on SYNOPSIS part for oo-admin-ctl-app
Merge pull request #5817 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #5814 from ncdc/watchman-filter-logshifter-haproxy-bz1133629

Merged by openshift-bot
Merge pull request #5816 from dobbymoodge/mysql_cart_tweak

Merged by openshift-bot
Multiple bug fixes:
Bug 1086061 - Should update the description of clean command for oo-admin-ctl-cartridge tool
Bug 1109647 - Loss of alias on SYNOPSIS part for oo-admin-ctl-app
Bug 1065853 - Should prompt warning when leaving source code url blank but add branch/tag during app creation
Bug 1143024 - A setting of ZONES_MIN_PER_GEAR_GROUP=2 with two available zones will always error as though only one zone is available
Bug 1099796 - Should refine the error message when removing a nonexistent global team from file
Merge pull request #5819 from abhgupta/abhgupta-dev

Merged by openshift-bot
<oo-accept-broker> fix up handling of IFS

- IFS handling in oo-accept-broker was causing a false positive when
  reading the broker rails env and parsing the $SCLS variable.