From 8332443c8f62f13606569c9275c0d051fb187a71 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Wed, 8 Apr 2015 16:52:17 +0100 Subject: Move configobj to python-common In order to avoid duplicated chunk when merging Openstack branch. Change-Id: I91be6182e40569150a99fa7d28fdb2e988c50374 --- strata/cloudinit-support.morph | 5 ----- strata/python-common.morph | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph index 1c752e58..92d6f03d 100644 --- a/strata/cloudinit-support.morph +++ b/strata/cloudinit-support.morph @@ -7,10 +7,6 @@ build-depends: - morph: strata/python-common.morph - morph: strata/foundation.morph chunks: -- name: configobj - repo: upstream:configobj - ref: 935a78736e4eb43b9fafae87f5e9902328673f63 - unpetrify-ref: baserock/morph - name: python-cheetah repo: upstream:python-cheetah ref: 831aa6b99d9b4fb012ee644d8e80e0bc0eb6d6ed @@ -26,5 +22,4 @@ chunks: unpetrify-ref: baserock/morph build-depends: - boto - - configobj - python-cheetah diff --git a/strata/python-common.morph b/strata/python-common.morph index 5879febd..abe15665 100644 --- a/strata/python-common.morph +++ b/strata/python-common.morph @@ -44,3 +44,7 @@ chunks: repo: upstream:python-prettytable ref: 7a48f1e84049577370cf28632a75d2fd01e4142d unpetrify-ref: master +- name: configobj + repo: upstream:configobj + ref: 935a78736e4eb43b9fafae87f5e9902328673f63 + unpetrify-ref: baserock/morph -- cgit v1.2.1