summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Smith <mike.smith@codethink.co.uk>2015-03-16 11:12:19 (GMT)
committerMike Smith <mike.smith@codethink.co.uk>2015-03-20 14:16:24 (GMT)
commit9e6cdd41f59faf745bc2d8e9afd02269c8d91fc1 (patch)
tree2c54f660c26d3ef4231c311cbddab3dfd4300a9c
parent697850ed65e9655773623231bf1a7393a5929e85 (diff)
downloaddefinitions-baserock/mikesmith/openstack-common-upates-new.tar.gz
Merge in changes made to common components duplicated in openstack-commonbaserock/mikesmith/openstack-common-upates-new
openstack-common.morph contains a fork of some components that are in other Baserock strata. We need newer versions of some components, so this merges in changes that were made to the stratum we forked openstack-common from. When the two are unified, this change can be discarded.
-rw-r--r--strata/openstack-common.morph47
1 files changed, 26 insertions, 21 deletions
diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph
index f59f670..f0b991d 100644
--- a/strata/openstack-common.morph
+++ b/strata/openstack-common.morph
@@ -9,11 +9,12 @@ build-depends:
chunks:
- name: pycparser
repo: upstream:python-packages/pycparser
- ref: c926670643ebb5f88a2bf56579fc9934c82be6d2
- unpetrify-ref: master
+ ref: e242e4ca1c5b089013fc508404f43b333a4f05e6
+ unpetrify-ref: release_v2.10
+ build-depends: []
- name: cffi
repo: upstream:python-packages/cffi
- ref: fc53b53095d61a1ec5814c09c3bf2c7e18627fb5
+ ref: e04f6acb6468bcc5fd1c427568aa534101d5cf5c
unpretrify-ref: master
build-depends:
- pycparser
@@ -37,8 +38,8 @@ chunks:
unpetrify-ref: release_0_1_7_tag
- name: cryptography
repo: upstream:python-packages/cryptography
- ref: 9ac7d55150c8410a08ee3b00b89bfeac3dbd8e8f
- unpetrify-ref: 0.7.2
+ ref: 3dd326767b34980f3095c67251d77a86bc9202fe
+ unpetrify-ref: 0.8
build-depends:
- pyasn1
- enum34
@@ -49,16 +50,17 @@ chunks:
unpetrify-ref: 0.1.10
- name: netaddr
repo: upstream:netaddr
- ref: bbb31ed50a5338a7d1c0011fc4429d09954f9f0b
- unpetrify-ref: release-0.7.12
+ ref: 71d1916aa5cb9e1672fcbd75843db0e0ced2e6b6
+ unpetrify-ref: release-0.7.13
+ build-depends: []
- name: stevedore
- ref: 860bd8f8ecba38fdfda5b41a3a1dbe854d6528e2
- unpetrify-ref: 1.0.0.0a2
+ ref: 218e95d5f09563bd14c50ee0441855f3389af7e7
+ unpetrify-ref: 1.3.0
repo: upstream:openstack/stevedore
- name: oslo-config
repo: upstream:openstack/oslo-config
- ref: 059579ac2189b94bc9e9555b2e9acfb31a83ef53
- unpetrify-ref: 1.4.0.0a5
+ ref: dc28858f353531444a4f65ffd4330615dd26892a
+ unpetrify-ref: 1.9.2
build-depends:
- netaddr
- stevedore
@@ -68,14 +70,14 @@ chunks:
unpetrify-ref: 0.14
- name: oslo-i18n
repo: upstream:openstack/oslo-i18n
- ref: 040f1d6afa733527385d2309e485bf37e9843b0e
- unpetrify-ref: 0.4.0
+ ref: b0faab7b3d3ea3b14053ab92dd6086956f643e15
+ unpetrify-ref: 1.5.0
build-depends:
- babel
- name: oslo-utils
repo: upstream:openstack/oslo-utils
- ref: 6a123fce93895e92004ce9d5bd8dee3c3642cf41
- unpetrify-ref: 0.3.0
+ ref: 91dc782c2f11fb76425effd7a331d63111adf1ce
+ unpetrify-ref: 1.4.0
build-depends:
- babel
- pyiso8601
@@ -86,13 +88,16 @@ chunks:
unpetrify-ref: 2.2.0
- name: oslo-serialization
repo: upstream:openstack/oslo-serialization.git
- ref: 80fec894a54253d9b4c80dd8a563957966ca0b88
- unpetrify-ref: 0.3.0
+ ref: 7bfd5dece0f22dbdea1c3e524dbc0eca1f70f1b7
+ unpetrify-ref: 1.4.0
+ build-depends: []
- name: jsonschema
repo: upstream:jsonschema
- ref: 35b60f390098d3306c03eee27ceec8cf8a493579
- unpetrify-ref: v2.3.0
+ ref: 9f1827038e93663f54c6d6d3b81197a2648109c6
+ unpetrify-ref: master
+ build-depends: []
- name: simplejson
repo: upstream:simplejson
- ref: 54d5ff15d508c51366986cc4f77f2f287f036582
- unpetrify-ref: v3.6.4
+ ref: d52cd59d28766c72314537e2a087665b8b54fa9b
+ unpetrify-ref: v3.6.5
+ build-depends: []