diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-04-23 16:46:43 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-04-23 16:46:43 +0000 |
commit | 7bf8bd3961b2f5a47071e9c28827089e1fc50f15 (patch) | |
tree | c5070a4ccf65aabaade165a23638f713fe2df028 | |
parent | 0dfe3d367700eb0eb6bd326561f7670802e5a15c (diff) | |
parent | 0cbe5ba49f6c7166cc2f7fe9e42299dba8290bab (diff) | |
download | definitions-7bf8bd3961b2f5a47071e9c28827089e1fc50f15.tar.gz |
Merge branch 'liw/new-lc-2-rebase'
Reviewed-by: Richard Maw
Reviewed-by: Daniel Silverstone
-rw-r--r-- | trove.morph | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/trove.morph b/trove.morph index 84fbaf72..2cb73192 100644 --- a/trove.morph +++ b/trove.morph @@ -163,7 +163,7 @@ chunks: build-depends: [] - name: lorry repo: baserock:baserock/lorry - ref: 5afef32028fbcacb7acc3d0318407169dd2353de + ref: ede3f337e9769b0e6756d4b9cc37d33aa62b82ba unpetrify-ref: master build-depends: - bzr-tarball @@ -178,12 +178,12 @@ chunks: - hg-fast-export - name: trove-setup repo: baserock:baserock/trove-setup - ref: 56b4fc537662d8d42f366b5cb5be0eada79d8d56 + ref: eafba37e2bfc3897e3e7f65f2ce087fbee358f43 unpetrify-ref: master build-depends: [] - name: lorry-controller repo: baserock:baserock/lorry-controller - ref: 627c50633977804e6a10bafad81e72ae376b1cf6 + ref: 5e2584a7936af5413588232be1f0df7b4cef18c1 unpetrify-ref: master build-depends: [] - name: lighttpd |