MegaShift => Silver
Merge remote-tracking branch 'origin/master' into update_to_new_plan_values
Fix health_check.php to conform PHP 5 standards
WIP Cartridge Refactor - Refactor V2 connector_execute to use V1 contract
Remove references to plans from origin-server
Bug 927618
Bug 923746 - Tax exempt link should point to public page

Move link to LI
fixing test cases
Bug 927614: Fix action hook execution during v2 control ops

Fix action hook execution during v2 do_control calls, and add cucumber
test coverage for the build cycle to exercise action hooks.
HAProxy WIP.

Cart repo version fixes.

HAProxy WIP.

SSH key setup for HAProxy.

Fixes to get the HAProxy daemon running.

Add haproxy hooks.

Add php connection hooks.

Move hooks

Fix php publish hooks.

Fix haproxy connection hooks to support scale-up/scale-down.

HAProxy control script fixes.
Automatic commit of package [openshift-origin-cartridge-haproxy] release [0.1.1-1].
Update docs generation and add node/cartridge guides [WIP]
https://trello.com/c/yUMBZ0P9
Add placeholder styles for usage graph types
Merge pull request #1807 from danmcp/master

Fixing test cases
Fix for not showing proper cartridge errors
Merge pull request #1801 from VojtechVitek/php5_standard

Merged by openshift-bot
Bug 915673
don't catch Mongoid::Errors::DocumentNotFound
Merge pull request #1804 from jwhonce/wip/connectors

Merged by openshift-bot
WIP Cartridge Refactor - Add PHP support for threaddump

* Add proper return code to PHP cartridge
* Use V1 contract to report error
* Update cucumber tetss