summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-05-15 12:39:00 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-05-21 14:10:38 (GMT)
commitaf8669d8b5fc39fc6290ed5e237cc32c62f6b6c9 (patch)
tree9769db8b3894cbc14dbc44129d12990c59025aa1
parent7a4507d97b36af162f9a0935bb5f284ff067b56d (diff)
downloaddefinitions-af8669d8b5fc39fc6290ed5e237cc32c62f6b6c9.tar.gz
Upgrade horizon to 2015.1.0 (Kilo), and dependencies
New componentes needed: - pint 0.6 as a horizon dependency - xstatic-angular-lrdragndrop 1.0.2.3 - xstatic-magic-search 0.2.0.1 - xstatic-termjs 0.0.4.2 The following upgrades were needed: - django-openstack-auth to 1.2.0 - python-heatclient to 0.4.0 - python-saharaclient to 0.8.0 - xstatic-bootstrap-datepicker to 1.3.1 - xstatic-bootstrap-scss to 3.1.1.1 - xstatic-d3 to 3.1.6.2 - xstatic-hogan to 2.0.0.2
-rw-r--r--strata/openstack-clients.morph8
-rw-r--r--strata/openstack-services.morph16
-rw-r--r--strata/xstatic.morph20
3 files changed, 31 insertions, 13 deletions
diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index 86251e8..da177fc 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -72,8 +72,8 @@ chunks:
- python-keystoneclient
- name: python-heatclient
repo: upstream:openstack/python-heatclient
- ref: 6089d31e302d80910cc15132f99a1bf358bbb64f
- unpetrify-ref: 0.2.12
+ ref: 6d528f005742263837d05250662bf6214a703da8
+ unpetrify-ref: 0.4.0
build-depends:
- python-keystoneclient
- name: python-designateclient
@@ -92,8 +92,8 @@ chunks:
- cliff
- name: python-saharaclient
repo: upstream:openstack/python-saharaclient
- ref: eadb40ccb62566f02cb93ec03aa232e48835dec3
- unpetrify-ref: 0.7.6
+ ref: 319ceb6acf55382218dcd971367613aecb3e4afc
+ unpetrify-ref: 0.8.0
build-depends:
- python-keystoneclient
- name: python-ironicclient
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index 3294eb3..5b18307 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -614,16 +614,22 @@ chunks:
- wsme
- name: django-openstack-auth
repo: upstream:openstack/django_openstack_auth
- ref: e676c88a329af57d6c4f13df54f6e1e06c1f8360
- unpetrify-ref: 1.1.8
+ ref: 0e1f7b78277850634992a594132921efb83256e0
+ unpetrify-ref: 1.2.0
+- name: pint
+ repo: upstream:python-packages/pint
+ ref: e7e7de5ca2e1c19963be8a918369fb19186f9a73
+ unpetrify-ref: 0.6
- name: horizon
morph: strata/openstack-services/horizon.morph
repo: upstream:openstack/horizon
- ref: b37c1f3565e89a7fe3fef5ce76e9c26b22e3e7c4
- unpetrify-ref: 2014.2.3
+ ref: b99cf48ff346494198fb9740495eacc14fa406bf
+ unpetrify-ref: 2015.1.0
build-depends:
+ - pint
- django-openstack-auth
- - lockfile
+ - kombu
+ - oslo-concurrency
- name: novnc
morph: strata/openstack-services/novnc.morph
repo: upstream:novnc
diff --git a/strata/xstatic.morph b/strata/xstatic.morph
index bf21a29..0b400df 100644
--- a/strata/xstatic.morph
+++ b/strata/xstatic.morph
@@ -26,8 +26,12 @@ chunks:
unpetrify-ref: master
- name: xstatic-angular-bootstrap
repo: upstream:xstatic-packages/xstatic-angular-bootstrap
- ref: 2a8c157b8b0733afbfdaf7eea29cf012a8b7f483
- unpetrify-ref: master
+ ref: b581edb6975175a564fd02766aef2f9043702c80
+ unpetrify-ref: 0.11.0.3
+- name: xstatic-angular-lrdragndrop
+ repo: upstream:xstatic-packages/xstatic-angular-lrdragndrop
+ ref: 55c7494492e6da2a6664aa00941864dd64589396
+ unpetrify-ref: 1.0.2.3
- name: xstatic-angular-cookies
repo: upstream:xstatic-packages/xstatic-angular-cookies
ref: 66141a33ae7ad84b82ba9384a8101ae15ccd6da5
@@ -54,8 +58,8 @@ chunks:
unpetrify-ref: master
- name: xstatic-bootstrap-scss
repo: upstream:xstatic-packages/xstatic-bootstrap-scss
- ref: e8ca8e38e464691268faec8cd6ae59777ee7ee9e
- unpetrify-ref: master
+ ref: d81b7b71c6c088406e90d1bdba0e10f0a304bbdc
+ unpetrify-ref: 3.1.1.1
- name: xstatic-d3
repo: upstream:xstatic-packages/xstatic-d3
ref: 1e754e73c801fb9315995ffeb95ae51233c4fcaf
@@ -96,6 +100,10 @@ chunks:
repo: upstream:xstatic-packages/xstatic-jquery-ui
ref: b494369430dafd8ac4ddbe90efb9f8ad20a6e6d1
unpetrify-ref: 1.11.0.1
+- name: xstatic-magic-search
+ repo: upstream:xstatic-packages/xstatic-magic-search
+ ref: 60d6954a36e54afa1f925324e7b527d235bdb484
+ unpetrify-ref: 0.2.0.1
- name: xstatic-jsencrypt
repo: upstream:xstatic-packages/xstatic-jsencrypt
ref: 5c0f088310ecd602e3aaf5e683385b0d27258409
@@ -112,3 +120,7 @@ chunks:
repo: upstream:xstatic-packages/xstatic-spin
ref: 74b4c0d0ff12db1f84787246857d5e925ff6883f
unpetrify-ref: master
+- name: xstatic-termjs
+ repo: upstream:xstatic-packages/xstatic-termjs
+ ref: a4ac0b809ab0d84c636a760215839bb6d68d0113
+ unpetrify-ref: master