fix bad variable reference for version check
Bug 1081954 - Prevent killing non-existent haproxy process when force-stopped
Merge pull request #5117 from bparees/jbossews_upgrade

Merged by openshift-bot
Merge pull request #5118 from mfojtik/bugzilla/1081954

Merged by openshift-bot
Bug 1082488 - Silence error message on node with no gears
Bug 1082696 - Add lua-devel as dependency
Merge pull request #5120 from jwhonce/bug/1082488

Merged by openshift-bot
Merge pull request #5121 from tdawson/2014-03/tdawson/add-lua-devel-dep

Merged by openshift-bot
Bug 1079293 - Fix warning msg in oo-admin-ctl-region remove-zone
Merge pull request #5123 from pravisankar/dev/ravi/bug1079293

Merged by openshift-bot
Fix oo-admin-clear-pending-ops : With '--time 0' option, ignore pending_ops or pending_op_groups created_at field and process any pending op or op-groups if it exists
Merge pull request #5122 from pravisankar/dev/ravi/fix-clear-pending-ops

Merged by openshift-bot
Bug 1076217 - Making the tc outbound settings configurable

Instead of hardcoding smtp related tc settings they can now be declared in
resource_limits.conf as follows:

[tc_outbound_limit 1]
  port=587
  rate=128kbit
  ceil=256kbit

[tc_outbound_limit 2]
  port=25
  rate=12kbit
  ceil=24kbit

[tc_outbound_limit 3]
  port=465
  rate=12kbit
  ceil=24kbit

This now allows additional tc settings to be created as well.  The previous
defaults have temporarily been added to the Config::Cgroups class to facilitate
the transition.  Eventually they will be removed to allow admins to easily
specify no rules (therefore disabling traffic control).

The resulting rules are exactly the same as before.  Namely, a class is created
for each combination of rate and ceiling.  It's then linked to the
corresponding port by the flowid's minor number.

It's important to note that this approach uses the inifile group syntax in an
effort to avoid any sort of special parsing.  Any group with
'tc_outbound_limit' anywhere in the name will match and everything else is
simply added to make the group unique.  Therefore the following would all
technically be valid:

[my_tc_outbound_limit]
  port=465
  rate=12kbit
  ceil=24kbit

[ tc_outbound_limit_A]
  port=80
  rate=12kbit
  ceil=24kbit

I wanted to avoid having to parse something like:

tc_outbound_limit.1="22,12kbit,24kbit"

Adding labels to the multivalue setting would only make the parsing more
rediculous.  Using groups allows for easy addition of new settings.
Adding error checking for outbound tc settings
Adding a function test for outbound traffic control
Card origin_card_157 - Document new env variables available for tuning PosgreSQL performance
Bug 1082937 - Check if the PID is non-empty for postgresql cartridge
Merge pull request #5128 from mfojtik/card_157_doc

Merged by openshift-bot
Revert "Card origin_cartridge_133 - Maintain application state across snapshot/restore"

This reverts commit 2b90c5fcf9cee4ddf95dece0546970d7da13780e.

Revert "Bug 1030305 - 'rhc app show --state/--gear' shows db gear stop after"

This reverts commit 01feb57a151b8829d6900efb2b8d1b05a6b78fdf.

Conflicts:
	controller/test/cucumber/step_definitions/application_steps.rb
Update README.md