Merge branch 'services-r7'

Bump version of vcap_{common,staging} gems Conflicts: cloud_controller/vendor/cache/vcap_common-1.0.4.gem health_manager/Gemfile health_manager/Gemfile.lock health_manager/vendor/cache/vcap_common-1.0.4.gem package_cache/Gemfile package_cache/Gemfile.lock package_cache_client/vendor/cache/vcap_common-1.0.3.gem staging/Gemfile.lock staging/vcap_staging.gemspec Change-Id: I965209a184ac06319ac23f490fba9069e5defa8f
cloudfoundry-attic · Feb 1, 2012 · ff29efe · ff29efe
1 parent 8709d24
commit ff29efe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,7 @@ gem 'eventmachine'
 gem "http_parser.rb", :require => "http/parser"
 gem "yajl-ruby", :require => ["yajl", "yajl/json_gem"]
 
-gem 'vcap_common', '~> 1.0.4'
+gem 'vcap_common', '~> 1.0.6'
 gem 'vcap_logging', :require => ['vcap/logging']
 
 group :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -33,7 +33,7 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    vcap_common (1.0.4)
+    vcap_common (1.0.6)
       eventmachine (~> 0.12.11.cloudfoundry.3)
       logging (>= 1.5.0)
       nats (~> 0.4.22.beta.4)
@@ -55,6 +55,6 @@ DEPENDENCIES
   rake
   rcov
   rspec
-  vcap_common (~> 1.0.4)
+  vcap_common (~> 1.0.6)
   vcap_logging
   yajl-ruby