Merge pull request #5588 from bparees/fix_haproxy_msg

OpenShift Bot · OpenShift Bot · commit b2d8f598f6c0 · 2014-07-10T08:50:44.000-04:00
Merged by openshift-bot
diff --git a/cartridges/openshift-origin-cartridge-haproxy/bin/control b/cartridges/openshift-origin-cartridge-haproxy/bin/control
@@ -99,7 +99,7 @@ function _start_haproxy_service() {
             echo "Action hook haproxy_ctld.rb removed"
             _stop_haproxy_ctld || :
             _start_haproxy_ctld
-            echo "Action hook haproxy_ctld.rb restarted"
+            echo "Cartridge haproxy_ctld.rb started"
         fi                        
     fi
 }
diff --git a/cartridges/openshift-origin-cartridge-haproxy/metadata/manifest.yml b/cartridges/openshift-origin-cartridge-haproxy/metadata/manifest.yml
@@ -10,8 +10,9 @@ 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.18
+Cartridge-Version: 0.0.19
 Compatible-Versions:
+- 0.0.18
 - 0.0.17
 - 0.0.16
 Cartridge-Vendor: redhat

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ function _start_haproxy_service() {`
`99`	`99`	`echo "Action hook haproxy_ctld.rb removed"`
`100`	`100`	`_stop_haproxy_ctld \|\| :`
`101`	`101`	`_start_haproxy_ctld`
`102`		`- echo "Action hook haproxy_ctld.rb restarted"`
	`102`	`+ echo "Cartridge haproxy_ctld.rb started"`
`103`	`103`	`fi`
`104`	`104`	`fi`
`105`	`105`	`}`