Merge pull request #6286 from abhgupta/abhgupta-dev

Merged by openshift-bot

Author: OpenShift Bot

cartridges/openshift-origin-cartridge-haproxy/metadata/manifest.yml

@@ -10,10 +10,11 @@ Version: '1.4'
 License: GPLv2+
 License-Url: http://www.gnu.org/licenses/gpl-2.0.html
 Vendor: http://haproxy.1wt.eu/
-Cartridge-Version: 0.0.23
+Cartridge-Version: 0.0.24
 Compatible-Versions:
 - 0.0.21
 - 0.0.22
+- 0.0.23
 Cartridge-Vendor: redhat
 Categories:
 - web_proxy
@@ -63,7 +64,7 @@ Endpoints:
       target_update: true
       connections: -1
       websocket: true
-  - Frontend: /health
+  - Frontend: "/health"
     Backend: configuration/health
     Options:
       file: true
@@ -73,9 +74,9 @@ Endpoints:
   Protocols:
   - http
   Mappings:
-  - Frontend: /haproxy-status
-    Backend: /
-  - Frontend: /health
+  - Frontend: "/haproxy-status"
+    Backend: "/"
+  - Frontend: "/health"
     Backend: ''
     Options:
       health: true

cartridges/openshift-origin-cartridge-jbosseap/metadata/manifest.yml

@@ -9,7 +9,7 @@ Version: '6'
 License: LGPL
 License-Url: http://www.gnu.org/copyleft/lesser.txt
 Vendor: Red Hat
-Cartridge-Version: 0.0.25
+Cartridge-Version: 0.0.26
 Compatible-Versions:
 - 0.0.18
 - 0.0.19
@@ -18,6 +18,7 @@ Compatible-Versions:
 - 0.0.22
 - 0.0.23
 - 0.0.24
+- 0.0.25
 Cartridge-Vendor: redhat
 Categories:
 - service

cartridges/openshift-origin-cartridge-jbossews/metadata/manifest.yml

@@ -2,16 +2,8 @@
 Name: jbossews
 Cartridge-Short-Name: JBOSSEWS
 Cartridge-Vendor: redhat
-Cartridge-Version: 0.0.29
-Compatible-Versions:
-- 0.0.21
-- 0.0.22
-- 0.0.23
-- 0.0.24
-- 0.0.25
-- 0.0.26
-- 0.0.27
-- 0.0.28
+Cartridge-Version: 0.0.30
+Compatible-Versions: []
 Display-Name: Tomcat 7 (JBoss EWS 2.0)
 Description: JBoss Enterprise Web Server is the enterprise-class Java web container
   for large-scale lightweight web applications based on Tomcat 7. Build and deploy

cartridges/openshift-origin-cartridge-php/metadata/manifest.yml

@@ -21,7 +21,7 @@ Version-Overrides:
 License: The PHP License, version 3.0
 License-Url: http://www.php.net/license/3_0.txt
 Vendor: php.net
-Cartridge-Version: 0.0.27
+Cartridge-Version: 0.0.28
 Compatible-Versions:
 - 0.0.20
 - 0.0.21
@@ -30,6 +30,7 @@ Compatible-Versions:
 - 0.0.24
 - 0.0.25
 - 0.0.26
+- 0.0.27
 Cartridge-Vendor: redhat
 Categories:
 - service
@@ -66,7 +67,7 @@ Endpoints:
     Backend: ''
     Options:
       websocket: true
-  - Frontend: /health
+  - Frontend: "/health"
     Backend: ''
     Options:
       health: true