From ab5b80bb81fa8ddcac397003dc20cee9c494a72c Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 6 Jun 2013 11:40:56 +0200 Subject: [PATCH] Fix merge --- flow/client/bin/appflow | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/flow/client/bin/appflow b/flow/client/bin/appflow index ef7067c605..e9982807bc 100755 --- a/flow/client/bin/appflow +++ b/flow/client/bin/appflow @@ -403,11 +403,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do From FAILED_UNDEPLOYING continues shutting down the Service EOT -<<<<<<< HEAD command :recover, recover_desc, [:range, :serviceid_list] do -======= - command :deploy, deploy_desc, [:range, :service_id_list] do ->>>>>>> feature-1853 client = Service::Client.new( :username => options[:username], :password => options[:password], @@ -538,4 +534,4 @@ cmd=CommandParser::CmdParser.new(ARGV) do client.post("#{RESOURCE_PATH}/#{service_id}/role/#{args[1]}/action", json_action) } end -end \ No newline at end of file +end