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

Conflicts: config/blobs.yml
cloudfoundry-attic · May 13, 2015 · 98acef2 · 98acef2
2 parents 97673f2 + a40eefc
commit 98acef2
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
@@ -99,10 +99,6 @@ go-buildpack/go_buildpack-cached-v1.2.0.zip:
   object_id: da609e02-aec5-4d54-93bc-86ca0b44eed7
   sha: e58788c873ddbecd641532f32ce4d535b2a79f81
   size: 663443569
-python-buildpack/python_buildpack-cached-v1.2.0.zip:
-  object_id: 3e8561a1-7cdc-45c2-9eff-b8d49ebc4e88
-  sha: 2ca4545ab99ac2a2e430f58fe1ec55fe6b96a7b3
-  size: 685706721
 java-buildpack/java-buildpack-offline-v3.0.zip:
   object_id: 8fe6e89a-aa63-4119-8fd0-23715820f31d
   sha: a300c3fca530dc16345dbd6feb26b13897d05265
@@ -147,3 +143,7 @@ nodejs-buildpack/nodejs_buildpack-cached-v1.3.1.zip:
   object_id: ea681326-1a90-4099-a1e1-7f00740ddedb
   sha: 2f1b0e58cc6d0b0d2bf28059c8b42f9cca4ed5a5
   size: 72725931
+python-buildpack/python_buildpack-cached-v1.3.1.zip:
+  object_id: 5fcc88cf-cacb-4d04-8d6b-a39fb250b2f4
+  sha: 41ff98d6a742f248ddf56f5fae934b827d696264
+  size: 475785540
diff --git a/packages/buildpack_python/packaging b/packages/buildpack_python/packaging
@@ -1,3 +1,3 @@
 set -e -x
 
-cp python-buildpack/python_buildpack-cached-v1.2.0.zip ${BOSH_INSTALL_TARGET}
+cp python-buildpack/python_buildpack-cached-v1.3.1.zip ${BOSH_INSTALL_TARGET}
diff --git a/packages/buildpack_python/spec b/packages/buildpack_python/spec
@@ -1,4 +1,4 @@
 ---
 name: buildpack_python
 files:
-- python-buildpack/python_buildpack-cached-v1.2.0.zip
+- python-buildpack/python_buildpack-cached-v1.3.1.zip