Sahara

Merge lp:~corey.bryant/sahara/kilo-3 into lp:~ubuntu-server-dev/sahara/kilo

  1. kilo-3
  2. Merge into kilo
Proposed by Corey Bryant
Status: Merged
Merged at revision: 3
Proposed branch: lp:~corey.bryant/sahara/kilo-3
Merge into: lp:~ubuntu-server-dev/sahara/kilo
Diff against target: 179 lines (+45/-60)
4 files modified
debian/changelog (+8/-0)
debian/control (+37/-29)
debian/patches/disable-migration-tests.patch (+0/-30)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~corey.bryant/sahara/kilo-3
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+253732@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-01-07 15:17:50 +0000
3+++ debian/changelog 2015-03-20 19:13:21 +0000
4@@ -1,3 +1,11 @@
5+sahara (2015.1~b3-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * New upstream release.
8+ - d/control: Align with upstream dependencies.
9+ - d/p/disable-migration-tests.patch: Dropped. Tests are passed by upstream.
10+
11+ -- Corey Bryant <corey.bryant@canonical.com> Fri, 20 Mar 2015 15:08:54 -0400
12+
13 sahara (2015.1~b1-0ubuntu1) vivid; urgency=medium
14
15 * Sync with Debian experimental.
16
17=== modified file 'debian/control'
18--- debian/control 2015-01-07 15:17:50 +0000
19+++ debian/control 2015-03-20 19:13:21 +0000
20@@ -15,45 +15,50 @@
21 Build-Depends-Indep: alembic (>= 0.7.1),
22 openssh-client,
23 python-babel (>= 1.3),
24+ python-barbicanclient (>= 3.0.1),
25 python-cinderclient (>= 1:1.1.0),
26 python-coverage (>= 3.6),
27 python-eventlet (>= 0.15.2),
28 python-fixtures (>= 0.3.14),
29 python-flask (>= 0.10),
30 python-hacking,
31- python-heatclient (>= 0.2.9),
32+ python-heatclient (>= 0.3.0),
33 python-iso8601 (>= 0.1.9),
34+ python-jinja2 (>= 2.6),
35 python-jsonschema (>= 2.0.0),
36- python-keystoneclient (>= 1:0.11.1),
37+ python-keystoneclient (>= 1:1.1.0),
38 python-keystonemiddleware,
39 python-lockfile,
40- python-migrate (>= 0.9.1),
41+ python-mako (>= 0.4.0),
42+ python-migrate (>= 0.9.5),
43 python-mock (>= 1.0),
44 python-mysqldb,
45- python-neutronclient (>= 2.3.6),
46+ python-neutronclient (>= 2.3.11),
47 python-novaclient (>= 1:2.18.0),
48- python-oslo-context (>= 0.1.0),
49- python-oslo.concurrency (>= 0.3.0),
50- python-oslo.config (>= 1.4.0.0),
51- python-oslo.db (>= 1.1.0),
52- python-oslo.i18n (>= 1.0.0),
53- python-oslo.messaging (>= 1.4.1),
54- python-oslo.middleware (>= 0.1.0),
55- python-oslo.rootwrap (>= 1.3.0),
56- python-oslo.serialization (>= 1.0.0),
57- python-oslo.utils (>= 1.1.0),
58+ python-oslo-config (>= 1.9.0),
59+ python-oslo-context (>= 0.2.0),
60+ python-oslo-db (>= 1.5.0),
61+ python-oslo-log (>= 0.4.0),
62+ python-oslo-i18n (>= 1.0.0),
63+ python-oslo-messaging (>= 1.4.1),
64+ python-oslo-middleware (>= 0.1.0),
65+ python-oslo-rootwrap (>= 1.3.0),
66+ python-oslo-serialization (>= 1.0.0),
67+ python-oslo-utils (>= 1.1.0),
68 python-oslosphinx (>= 2.2.0.0),
69 python-oslotest (>= 1.2.0),
70 python-paramiko (>= 1.13.0),
71 python-posix-ipc,
72+ python-prettytable (>= 0.7),
73 python-psycopg2,
74 python-requests (>= 2.2.0),
75 python-saharaclient (>= 0.7.6),
76- python-six (>= 1.7.0),
77+ python-six (>= 1.9.0),
78 python-sphinxcontrib-httpdomain,
79 python-sqlalchemy (>= 0.9.7),
80 python-stevedore (>= 1.1.0),
81 python-swiftclient (>= 1:2.2.0),
82+ python-tempest-lib (>= 0.3.0),
83 python-testscenarios (>= 0.4),
84 python-testtools (>= 0.9.34),
85 python-webob (>= 1.2.3),
86@@ -70,33 +75,36 @@
87 Pre-Depends: dpkg (>= 1.15.6~)
88 Depends: alembic (>= 0.7.1),
89 python-babel (>= 1.3),
90+ python-barbicanclient (>= 3.0.1),
91 python-cinderclient (>= 1:1.1.0),
92 python-eventlet (>= 0.15.2),
93 python-flask (>= 0.10),
94- python-heatclient (>= 0.2.9),
95+ python-heatclient (>= 0.3.0),
96 python-iso8601 (>= 0.1.9),
97+ python-jinja2 (>= 2.6),
98 python-jsonschema (>= 2.0.0),
99- python-keystoneclient (>= 1:0.11.1),
100+ python-keystoneclient (>= 1:1.1.0),
101 python-keystonemiddleware,
102 python-lockfile,
103 python-mysqldb,
104- python-neutronclient (>= 2.3.6),
105+ python-neutronclient (>= 2.3.11),
106 python-novaclient (>= 1:2.18.0),
107- python-oslo-context (>= 0.1.0),
108- python-oslo.concurrency (>= 0.3.0),
109- python-oslo.config (>= 1.4.0.0),
110- python-oslo.db (>= 1.1.0),
111- python-oslo.i18n (>= 1.0.0),
112- python-oslo.messaging (>= 1.4.1),
113- python-oslo.middleware (>= 0.1.0),
114- python-oslo.rootwrap (>= 1.3.0),
115- python-oslo.serialization (>= 1.0.0),
116- python-oslo.utils (>= 1.1.0),
117+ python-oslo-concurrency (>= 0.3.0),
118+ python-oslo-config (>= 1.9.0),
119+ python-oslo-context (>= 0.2.0),
120+ python-oslo-db (>= 1.5.0),
121+ python-oslo-i18n (>= 1.0.0),
122+ python-oslo-log (>= 0.4.0),
123+ python-oslo-messaging (>= 1.4.1),
124+ python-oslo-middleware (>= 0.1.0),
125+ python-oslo-rootwrap (>= 1.3.0),
126+ python-oslo-serialization (>= 1.0.0),
127+ python-oslo-utils (>= 1.1.0),
128 python-paramiko (>= 1.13.0),
129 python-pbr (>= 0.6),
130 python-posix-ipc,
131 python-requests (>= 2.2.0),
132- python-six (>= 1.7.0),
133+ python-six (>= 1.9.0),
134 python-sqlalchemy (>= 0.9.7),
135 python-stevedore (>= 1.1.0),
136 python-swiftclient (>= 1:2.2.0),
137
138=== removed file 'debian/patches/disable-migration-tests.patch'
139--- debian/patches/disable-migration-tests.patch 2015-01-07 14:54:50 +0000
140+++ debian/patches/disable-migration-tests.patch 1970-01-01 00:00:00 +0000
141@@ -1,30 +0,0 @@
142-Description: Disable Migration Tests
143- The migration tests in oslo.db currently have a hard requirement
144- on configured and running MySQL and PostgreSQL instances.
145- .
146- This should really be opportunistic, so disable for now.
147-Author: James Page <james.page@ubuntu.com>
148-Forwarded: not-needed
149-
150---- a/sahara/tests/unit/db/migration/test_migrations.py
151-+++ b/sahara/tests/unit/db/migration/test_migrations.py
152-@@ -451,8 +451,7 @@ class TestMigrations(base.BaseWalkMigrat
153- self.assertColumnsExists(engine, 'cluster_events', events_columns)
154-
155-
156--class TestMigrationsMySQL(TestMigrations, base.MySQLTestsMixIn,
157-- base.TestModelsMigrationsSync):
158-+class TestMigrationsMySQL(TestMigrations, base.MySQLTestsMixIn):
159- def get_engine(self):
160- conn_string = ("mysql+mysqldb://%s:%s@localhost/%s"
161- % (self.USER, self.PASSWD, self.DATABASE))
162-@@ -460,8 +459,7 @@ class TestMigrationsMySQL(TestMigrations
163- return engine
164-
165-
166--class TestMigrationsPostgresql(TestMigrations, base.PostgresqlTestsMixIn,
167-- base.TestModelsMigrationsSync):
168-+class TestMigrationsPostgresql(TestMigrations, base.PostgresqlTestsMixIn):
169- def get_engine(self):
170- conn_string = ("postgresql+psycopg2://%s:%s@localhost/%s"
171- % (self.USER, self.PASSWD, self.DATABASE))
172
173=== modified file 'debian/patches/series'
174--- debian/patches/series 2015-01-07 14:54:50 +0000
175+++ debian/patches/series 2015-03-20 19:13:21 +0000
176@@ -1,3 +1,2 @@
177 fix-alembic-migration-for-sqlite-1.patch
178 fix-wrong-MANIFEST.in.patch
179-disable-migration-tests.patch

Subscribers

People subscribed via source and target branches