Merge remote-tracking branch 'origin/pr/579' into develop

Conflicts: config/blobs.yml
cloudfoundry-attic · Dec 23, 2014 · 3105e34 · 3105e34
2 parents 8d1db57 + e3324cd
commit 3105e34
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/config/blobs.yml b/config/blobs.yml
@@ -273,11 +273,6 @@ ruby-2.1.4/yaml-0.1.6.tar.gz:
   sha: !binary |-
     ZjNkNDA0ZTExYmVjM2M0ZWZjZGRmZDE0YzQyZDQ2ZjFhYWJlMGI1ZA==
   size: 503012
-ruby-buildpack/ruby_buildpack-offline-v1.1.4.zip:
-  object_id: be20483a-cd02-4955-8265-e51d867f0db2
-  sha: !binary |-
-    MDk4MTM0NWVhNjMyMTYwN2Y1Nzk1OWFlYWU1NDZlODFlNWM3YzQyYw==
-  size: 801585761
 java-buildpack/java-buildpack-offline-v2.6.zip:
   object_id: 9cee25a1-ddef-42c8-8b42-00631eb83414
   sha: !binary |-
@@ -303,3 +298,8 @@ nodejs-buildpack/nodejs_buildpack-offline-v1.1.1.zip:
   sha: !binary |-
     ZGZjNGVlYjIxZTY5MjVkM2NlNWNkMGU1MDBjZGJlODU4NjljZGMxNg==
   size: 437952578
+ruby-buildpack/ruby_buildpack-offline-v1.2.0.zip:
+  object_id: a5b72b99-fad8-4bcf-b7e9-36aaf903e93b
+  sha: !binary |-
+    ZGI2MWVkZDFmY2ZlMzk2MGM1YWUwNGZiMjlkZjY3ZmRlY2NmYjQwMQ==
+  size: 801595381
diff --git a/packages/buildpack_ruby/packaging b/packages/buildpack_ruby/packaging
@@ -1,3 +1,3 @@
 set -e -x
 
-cp ruby-buildpack/ruby_buildpack-offline-v1.1.4.zip ${BOSH_INSTALL_TARGET}
+cp ruby-buildpack/ruby_buildpack-offline-v1.2.0.zip ${BOSH_INSTALL_TARGET}
diff --git a/packages/buildpack_ruby/spec b/packages/buildpack_ruby/spec
@@ -2,4 +2,4 @@
 name: buildpack_ruby
 dependencies: 
 files:
-- ruby-buildpack/ruby_buildpack-offline-v1.1.4.zip
+- ruby-buildpack/ruby_buildpack-offline-v1.2.0.zip