Merge lp:~zulcss/ubuntu/saucy/cinder/2013.2.2 into lp:~ubuntu-server-dev/cinder/grizzly
Proposed by
Chuck Short
Status: | Superseded |
---|---|
Proposed branch: | lp:~zulcss/ubuntu/saucy/cinder/2013.2.2 |
Merge into: | lp:~ubuntu-server-dev/cinder/grizzly |
Diff against target: |
562 lines (+359/-54) (has conflicts) 13 files modified
debian/changelog (+207/-0) debian/cinder-common.install (+1/-0) debian/control (+50/-37) debian/patches/fix-sqlalchemy-requirements.patch (+15/-0) debian/patches/fix_cinder_dependencies.patch (+0/-11) debian/patches/revert-stable-havana-requirements.patch (+25/-0) debian/patches/series (+0/-1) debian/rules (+8/-5) debian/tests/cinder-daemons (+15/-0) debian/tests/cinder-volume (+17/-0) debian/tests/control (+3/-0) debian/tests/python-cinder (+14/-0) debian/tests/test_import_cinder.py (+4/-0) Text conflict in debian/changelog Text conflict in debian/control Text conflict in debian/rules |
To merge this branch: | bzr merge lp:~zulcss/ubuntu/saucy/cinder/2013.2.2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Server Developers | Pending | ||
Review via email: mp+208152@code.launchpad.net |
This proposal has been superseded by a proposal from 2014-02-25.
Description of the change
2013.2.2
To post a comment you must log in.
Unmerged revisions
- 153. By Chuck Short
-
Re-add missing bits
- 152. By Chuck Short
-
Releasing 2013.2.2
- 151. By Adam Gandelman
-
2013.2.1
- 150. By Adam Gandelman
-
d/changelog: typo
- 149. By Adam Gandelman
-
debian/
pathces/ revert- stable- havana- requirements. patch: Revert
version bumps to dependencies in stable/havana back to what was
shipped with Saucy. - 148. By Adam Gandelman
-
d/patches: 2013.2.1 refresh
- 147. By Chuck Short
-
2013.2
- 146. By James Page
-
releasing package cinder version 1:2013.
2~rc3-0ubuntu1 - 145. By James Page
-
releasing package cinder version 1:2013.
2~rc2-0ubuntu1 - 144. By Chuck Short
-
2013.2~rc1