diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-11-02 17:33:45 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-11-02 17:33:45 +0000 |
commit | 398a7fa93a05b44adba1d7557b1ad4a24f466369 (patch) | |
tree | 0d29311eecdb4dd8dade15b88884b991fec0f82e /strata/foundation.morph | |
parent | 8a575a776e7476cb3beb22bb6b71e269c6b55580 (diff) | |
parent | 6cb63998328664c5c234b5a5da7ea3a9026e4d2a (diff) | |
download | infrastructure-398a7fa93a05b44adba1d7557b1ad4a24f466369.tar.gz |
Merge tag 'baserock-15.34'
Conflicts:
README
clusters/release.morph
scripts/release-build
Change-Id: If289bcb168478405400c66717d7f33dcdde63cb6
Diffstat (limited to 'strata/foundation.morph')
-rw-r--r-- | strata/foundation.morph | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph index 22cb2d29..20166cf7 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -100,12 +100,6 @@ chunks: repo: baserock:baserock/tbdiff ref: 235e95c3479f96b04d33edecc684f985bda50e53 unpetrify-ref: master -- name: dbus-glib - repo: upstream:dbus-glib - ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c - unpetrify-ref: dbus-glib_0.102 - build-depends: - - dbus - name: rsync morph: strata/foundation/rsync.morph repo: upstream:rsync |