Bug 1028327 - No message about "skip_maven_build marker found .." after git push jbosseap-6 and jbossas-7 app with skip_maven_build marker added
Add retries in functional api
Attempt to add MariaDB 5.5 support through SCL based on recent MySQL commit
Attempt to add MariaDB 5.5 support through SCL based on recent MySQL commit
mysql cartridge was using a postgresql variable
update schema to latest jboss eap 6.2
distinguish between timed out and failed jboss starts
Fix for bug 1040673
Bug 1048294 - Tomcat does not clean work directory when application is redeployed
Modify PHP stop() to skip httpd stop when the process is already dead
Applied fix to other affected cartridges
Fix for bug 1047950 and bug 1047952
Merge pull request #4411 from nhr/service_fixes

Merged by openshift-bot
Card online_node_319 - Add quota check to git push

* Add Node#check_quotas to centralized quota reporting
* Refactor openshift#report_quota to use new method
* Add call to check_quotas to cartridge_actions#post_receive if stderr is provided
Merge pull request #4418 from abhgupta/bug_1040673

Merged by openshift-bot
Merge pull request #4421 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
Merge pull request #4423 from jwhonce/online_node_319

Merged by openshift-bot
allow custom ha prefix and suffix
Fix bug 1048992: Define remote_request? in console controller
Route changes

Conflicts:
	plugins/routing/activemq/lib/openshift/activemq_routing_plugin.rb