Fix merge

This commit is contained in:
Daniel Molina committed 2013-06-06 11:40:56 +02:00
1 parent 9dd0e43589
commit ab5b80bb81
1 file changed
+1 -5
+1 -5
View File
@@ -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
end