Upgrade to mocha 0.13.3 (compatible with Rails 3.2.12)
status call should echo expected message
Implement status function for ruby v2 cart based on simple curl.
<rubygem-openshift-origin-node spec file> Bug 963336 - Add 'Requires'
of mod_ssl to fix httpd failing to start on node servers due to
missing ssl module required by 000001_openshift_origin_node.conf

Bugzilla link <https://bugzilla.redhat.com/show_bug.cgi?id=963336>
Refactor trap-user tests
move SY envs to erbs
move SY envs to erbs
Make scaling info easier to get at in UI
Review comment - kill comments
<node/httpd conf> Bug 962938 - Set ProxyTimeout for node HTTPD config

Add ProxyTimeout setting to override server config default (picked up
from TimeOut, which is 60 in httpd.conf). Also add comment referencing
broker-specific setting for future reference.
Bug 963048 - the old oo-admin-ctl-gear script was setting/exporting APP_HOME and OPENSHIFT_HOME_DIR but the new version assumed that the start hook did that itself through setup_user_vars.
Fixing broken check to confirm gear UID existence in mongo
Merge pull request #2463 from BanzaiMan/dev/hasari/ruby_cart_v2_migration

Merged by openshift-bot
Merge pull request #2474 from BanzaiMan/dev/hasari/nodejs_cart_v2_migration

Merged by openshift-bot
Merge pull request #2480 from tbielawa/NodeGemSpecModSsl

Merged by openshift-bot
Merge pull request #2479 from ironcladlou/dev/v2carts/cuke/trap-user

Merged by openshift-bot
Merge pull request #2483 from bdecoste/master

Merged by openshift-bot
Merge pull request #2484 from smarterclayton/scale_info_feedback

Merged by openshift-bot
Merge pull request #2485 from dobbymoodge/BZ962938-broker-proxytimeout

Merged by openshift-bot
Merge pull request #2487 from rmillner/BZ963048

Merged by openshift-bot