From 5ce4e851d319ed0e5a092fcd71ce725cfd5f82ba Mon Sep 17 00:00:00 2001 From: Jesse Zhang Date: Thu, 26 Jul 2012 13:17:30 -0700 Subject: [PATCH] [stager] Git support PoC This change bumps vcap_staing to the PoC version of Git support. Test plan: - Unit tests passed - BVT's passed - Deployed to my dev instance and manually push apps with Git dependencies - Make sure CCNG with Git dependencies work Change-Id: I51fae5b1769b970be158917fd2ab3301c9a195d7 --- Gemfile | 2 +- Gemfile.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index f781236..c9bf3cc 100644 --- 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 index 011bb1e..1a73b0d 100644 --- 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)