You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2013/02/13 10:39:37 UTC
git commit: Adds JSON as a supported rtype (run_command) -
DTACLOUD-459
Updated Branches:
refs/heads/master fbd575ffb -> d92088279
Adds JSON as a supported rtype (run_command) - DTACLOUD-459
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/d9208827
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/d9208827
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/d9208827
Branch: refs/heads/master
Commit: d92088279ade54e69ff79d6a7068da815eccb5d9
Parents: fbd575f
Author: efcasado <ef...@gmail.com>
Authored: Fri Feb 8 14:58:19 2013 +0100
Committer: Michal fojtik <mf...@redhat.com>
Committed: Wed Feb 13 10:39:26 2013 +0100
----------------------------------------------------------------------
server/lib/deltacloud/collections/instances.rb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d9208827/server/lib/deltacloud/collections/instances.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/collections/instances.rb b/server/lib/deltacloud/collections/instances.rb
index adddacf..824ba15 100644
--- a/server/lib/deltacloud/collections/instances.rb
+++ b/server/lib/deltacloud/collections/instances.rb
@@ -115,6 +115,7 @@ module Deltacloud::Collections
respond_to do |format|
format.xml { haml :"instances/run" }
format.html { haml :"instances/run" }
+ format.json { JSON::dump({:instance => { :id => params[:id], :public_address => @output.ssh.network.ip, :command => @output.ssh.command, :output => @output.body}})}
end
end
end