deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject git commit: Fixes DTACLOUD-172: Adds json format for non-streaming blob creation
Date Wed, 28 Mar 2012 07:39:07 GMT
Updated Branches:
  refs/heads/master 2a1788edd -> d2d9cab94


Fixes DTACLOUD-172: Adds json format for non-streaming blob creation

https://issues.apache.org/jira/browse/DTACLOUD-172


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/d2d9cab9
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/d2d9cab9
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/d2d9cab9

Branch: refs/heads/master
Commit: d2d9cab9475f104bcf9156f33f51ad71927c1262
Parents: 2a1788e
Author: marios <marios@redhat.com>
Authored: Mon Mar 26 14:12:09 2012 +0300
Committer: marios <marios@redhat.com>
Committed: Wed Mar 28 10:38:00 2012 +0300

----------------------------------------------------------------------
 server/lib/deltacloud/server.rb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d2d9cab9/server/lib/deltacloud/server.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/server.rb b/server/lib/deltacloud/server.rb
index dd54b88..dacc6db 100644
--- a/server/lib/deltacloud/server.rb
+++ b/server/lib/deltacloud/server.rb
@@ -929,7 +929,8 @@ collection :buckets do
           temp_file.delete
           respond_to do |format|
             format.xml { haml :"blobs/show" }
-            format.html { haml :"blobs/show"}
+            format.html { haml :"blobs/show" }
+            format.json { convert_to_json(:blob, @blob) }
           end
         end
       end


Mime
View raw message