Merge "[stager] Git support PoC" into git-poc

cloudfoundry-attic · Jul 31, 2012 · c38acca · c38acca
2 parents 5ebcc08 + 5ce4e85
commit c38acca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem 'yajl-ruby', '>= 0.7.9'
 
 gem 'vcap_common', '2.0.0', :git => 'https://github.com/cloudfoundry/vcap-common.git', :ref => '5334b662'
 gem 'vcap_logging', '>= 0.1.3', :git => 'https://github.com/cloudfoundry/common.git', :ref => 'b96ec119'
-gem 'vcap_staging', '~> 0.1.61', :git => 'https://github.com/cloudfoundry/vcap-staging.git', :ref => '910bda9f'
+gem 'vcap_staging', '~> 0.1.61', :git => 'https://github.com/cloudfoundry/vcap-staging.git', :branch => 'git-support'
 gem 'vcap-concurrency', '~> 0.1.0', :git => 'https://github.com/cloudfoundry/vcap-concurrency.git', :ref => 'be2bdb9f'
 gem 'stager-client', '~> 0.0.2', :git => 'https://github.com/cloudfoundry/stager-client.git', :ref => 'fdaae720'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -45,10 +45,10 @@ GIT
 
 GIT
   remote: https://github.com/cloudfoundry/vcap-staging.git
-  revision: 910bda9fa69504fbe2202edceb8d0b7d1d253fb7
-  ref: 910bda9f
+  revision: 8815bbb63cc0a29cac2446751f428baa463b1101
+  ref: git-support
   specs:
-    vcap_staging (0.1.61)
+    vcap_staging (0.1.62)
       nokogiri (>= 1.4.4)
       rake
       rspec
@@ -76,14 +76,14 @@ GEM
     posix-spawn (0.3.6)
     rack (1.4.1)
     rake (0.9.2.2)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
+    rspec-mocks (2.11.1)
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)