summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-10-02 08:08:20 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-10-02 08:08:20 +0000
commit17d6673d64a2e78534c12c92a18e90def9ac31cd (patch)
treea0493b870acbe563b4572ee324bba1c7babc00fb
parentf1da7ace54bed18c5c7eac5242ec84d4ca81c55d (diff)
parent7e2d4b429d81ae747a4cd698e0b2518d6bd14643 (diff)
downloaddefinitions-17d6673d64a2e78534c12c92a18e90def9ac31cd.tar.gz
Merge branch 'baserock/sam/bash-upgrade'
Reviewed by: Richard Maw <richard.maw@codethink.co.uk> Paul Sherwood <paul.sherwood@codethink.co.uk> Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> Merged by: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-rw-r--r--strata/core.morph4
1 files changed, 2 insertions, 2 deletions
diff --git a/strata/core.morph b/strata/core.morph
index f0f22871..0f660b5a 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -86,8 +86,8 @@ chunks:
- name: bash
morph: strata/core/bash.morph
repo: upstream:bash
- ref: 783c677f45354b0d6df70e552217ecad8481804f
- unpetrify-ref: baserock/morph
+ ref: 3590145af6f1c9fa321dff231f69ae696e7e740b
+ unpetrify-ref: baserock/bash-4.3-patch-27
build-depends: []
- name: error-perl-tarball
repo: upstream:error-perl-tarball