diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-17 17:03:36 +0100 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-17 17:03:36 +0100 |
commit | eca4102de2c146fade89968ba7a68d03b69fc459 (patch) | |
tree | 73fdb280280d7e89a771c5dff4ef97d80c461ea0 /strata | |
parent | 562a7fa353747a62cede095ae7790ab4854ec922 (diff) | |
parent | d980deeb057d80b3c2f83eb2dff2c5b8a7de3a1d (diff) | |
download | definitions-eca4102de2c146fade89968ba7a68d03b69fc459.tar.gz |
Merge branch 'baserock/pedroalvarez/optional-upstream-trove'
Reviewed-by: Sam Thursfield
Reviewed-by: Lars Wirzenius
Diffstat (limited to 'strata')
-rw-r--r-- | strata/trove.morph | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strata/trove.morph b/strata/trove.morph index 14888353..6db0be5d 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -198,7 +198,7 @@ chunks: - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup - ref: b2260b5fb45f4519bf7ea31ac278ffac7cddfbb7 + ref: e594df7ed432d74cc56eaa5e29a1bfed7b22aae5 unpetrify-ref: master build-depends: [] - name: lorry-controller |