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

Conflicts: config/blobs.yml
cloudfoundry-attic · May 13, 2015 · 97673f2 · 97673f2
2 parents 7cf577b + c7a986a
commit 97673f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/config/blobs.yml b/config/blobs.yml
@@ -103,10 +103,6 @@ python-buildpack/python_buildpack-cached-v1.2.0.zip:
   object_id: 3e8561a1-7cdc-45c2-9eff-b8d49ebc4e88
   sha: 2ca4545ab99ac2a2e430f58fe1ec55fe6b96a7b3
   size: 685706721
-nodejs-buildpack/nodejs_buildpack-cached-v1.2.1.zip:
-  object_id: 21a8eb83-97b9-49cd-ba57-bd2cca1f9133
-  sha: 8c534057fc1fe0ccbdfa5547c25f30ad79dd368d
-  size: 437119230
 java-buildpack/java-buildpack-offline-v3.0.zip:
   object_id: 8fe6e89a-aa63-4119-8fd0-23715820f31d
   sha: a300c3fca530dc16345dbd6feb26b13897d05265
@@ -147,3 +143,7 @@ rtr/routing_api_cli.tgz:
   object_id: 5fb2b119-d894-4fcd-ab3d-69f9d51d2fab
   sha: bd18cdc02bf98ef37546d85b3496cbcd2c549497
   size: 2180884
+nodejs-buildpack/nodejs_buildpack-cached-v1.3.1.zip:
+  object_id: ea681326-1a90-4099-a1e1-7f00740ddedb
+  sha: 2f1b0e58cc6d0b0d2bf28059c8b42f9cca4ed5a5
+  size: 72725931
diff --git a/packages/buildpack_nodejs/packaging b/packages/buildpack_nodejs/packaging
@@ -1,3 +1,3 @@
 set -e -x
 
-cp nodejs-buildpack/nodejs_buildpack-cached-v1.2.1.zip ${BOSH_INSTALL_TARGET}
+cp nodejs-buildpack/nodejs_buildpack-cached-v1.3.1.zip ${BOSH_INSTALL_TARGET}
diff --git a/packages/buildpack_nodejs/spec b/packages/buildpack_nodejs/spec
@@ -1,4 +1,4 @@
 ---
 name: buildpack_nodejs
 files:
-- nodejs-buildpack/nodejs_buildpack-cached-v1.2.1.zip
+- nodejs-buildpack/nodejs_buildpack-cached-v1.3.1.zip