This directive throws a deprecation warning in apache 2.4
deployment_guide_comprehensive formatting and minor fix
Fix cart props split value
Bug 1063703: Assume ws if websocket is true.
Bug 1063455: Rescuing user ops in case the app gets deleted mid-way
Adding groups for gear extended
Fix obsoletes and provides
Bug 1063654 - Prevent obsolete cartridge use except for builders
Merge pull request #4372 from maxamillion/admiller/no_defaulttype_apache24

Merged by openshift-bot
Merge pull request #4699 from caruccio/fix-cart-props

Merged by openshift-bot
Merge pull request #4737 from mrunalp/bugs/1063703

Merged by openshift-bot
Merge pull request #4736 from danmcp/master

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

Merged by openshift-bot
Merge pull request #4396 from buckelij/master

<oo_deployment_guide_comprehensive> formatting and minor RHEL6 command fixes
Bug 1056426 - last-access info not deleted when gear deleted
Bug 1062852 - Can't remove mysql from shared gear

Also throw error when gear size would change on component add to an
existing instance.
Bug 1063470 - handle different encodings in files provided by ssl cert issuers
Merge pull request #4738 from smarterclayton/bug_1063654_prevent_obsolete_cart_creation

Merged by openshift-bot
Merge pull request #4740 from jwhonce/bug/1056426

Merged by openshift-bot
Merge pull request #4732 from smarterclayton/bug_1062852_cant_remove_shared_cart

Merged by openshift-bot