summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-09-15 14:10:15 +0100
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-09-15 14:10:15 +0100
commit60ae4a0ab0e23a9257adb75eca856224dfec0f58 (patch)
treeee6f531504edb95abdfd6d05378633860f9fbb6a
parent6523c60a6e918d982ac378beef48e0d3dfa0603e (diff)
parent9ee73b2d536ea7b851827d3d594a5a6f1763f498 (diff)
downloaddefinitions-60ae4a0ab0e23a9257adb75eca856224dfec0f58.tar.gz
Merge branch 'baserock/franred/update-morph-chunks-to-fix-tarfile-chown-python'
Reviewed by: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Sam Thursfield <sam.thursfield@codethink.co.uk> Merged by: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-rw-r--r--strata/cross-bootstrap.morph2
-rw-r--r--strata/tools.morph2
2 files changed, 2 insertions, 2 deletions
diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph
index 00bff2ca..50a230d6 100644
--- a/strata/cross-bootstrap.morph
+++ b/strata/cross-bootstrap.morph
@@ -74,7 +74,7 @@ chunks:
- six
- name: morph
repo: baserock:baserock/morph
- ref: fc245d337c5b9799579a0d03d5596e926bf6037d
+ ref: a32de7934cce79dda2b8dc20be1c5ec94109869e
unpetrify-ref: master
build-depends:
- cliapp
diff --git a/strata/tools.morph b/strata/tools.morph
index c7842f87..590d75d5 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -100,7 +100,7 @@ chunks:
- six
- name: morph
repo: baserock:baserock/morph
- ref: 47210250a11a0c1542d707fec325ebcab8f85820
+ ref: a32de7934cce79dda2b8dc20be1c5ec94109869e
unpetrify-ref: master
build-depends:
- cliapp