Merge lp:~openstack-ubuntu-testing/nova/precise-essex-proposed into lp:~ubuntu-server-dev/nova/essex

Proposed by Adam Gandelman on 2012-03-22
Status: Merged
Merged at revision: 344
Proposed branch: lp:~openstack-ubuntu-testing/nova/precise-essex-proposed
Merge into: lp:~ubuntu-server-dev/nova/essex
Diff against target: 56 lines (+14/-4)
3 files modified
debian/changelog (+8/-0)
debian/control (+6/-3)
debian/nova-console.install (+0/-1)
To merge this branch: bzr merge lp:~openstack-ubuntu-testing/nova/precise-essex-proposed
Reviewer Review Type Date Requested Status
Chuck Short 2012-03-22 Pending
Review via email: mp+98916@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 2012-03-20 15:10:40 +0000
3+++ debian/changelog 2012-03-22 20:24:19 +0000
4@@ -1,3 +1,11 @@
5+nova (2012.1~rc1-0ubuntu2) precise; urgency=low
6+
7+ * debian/control: Add Breaks/Replaces to nova-consoleauth, update
8+ description, nova-console Recommends nova-consoleauth
9+ * debian/nova-console.install: Remove nova-consoleauth
10+
11+ -- Adam Gandelman <adamg@canonical.com> Thu, 22 Mar 2012 11:31:35 -0700
12+
13 nova (2012.1~rc1-0ubuntu1) precise; urgency=low
14
15 [ Adam Gandelman ]
16
17=== modified file 'debian/control'
18--- debian/control 2012-03-19 22:17:04 +0000
19+++ debian/control 2012-03-22 20:24:19 +0000
20@@ -500,6 +500,7 @@
21 Package: nova-console
22 Architecture: all
23 Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
24+Recommends: nova-consoleauth (>= 2012.1~rc1-0ubuntu2)
25 Description: OpenStack Compute - Console
26 OpenStack is a reliable cloud infrastructure. Its mission is to produce
27 the ubiquitous cloud computing platform that will meet the needs of public
28@@ -522,6 +523,8 @@
29 Package: nova-consoleauth
30 Architecture: all
31 Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
32+Breaks: nova-console (<< 2012.1~rc1-0ubuntu2)
33+Replaces: nova-console (<< 2012.1~rc1-0ubuntu2)
34 Description: OpenStack Compute - Console Authenticator
35 OpenStack is a reliable cloud infrastructure. Its mission is to produce
36 the ubiquitous cloud computing platform that will meet the needs of public
37@@ -537,9 +540,9 @@
38 (SQLite, MySQL, and PostgreSQL, for instance), different types of user
39 databases (LDAP or SQL), etc.
40 .
41- This package provides the console server. This enables the use of consoles
42- to be used along with XVP and XenServer. It is a publically reachable
43- component which proxies access to VNCs running on compute nodes.
44+ This package provides the authentication service for nova-console. It grants
45+ user requests for console access based on tokens in the identity service and
46+ allows access to virtual consoles via a browser.
47
48 Package: nova-doc
49 Architecture: all
50
51=== modified file 'debian/nova-console.install'
52--- debian/nova-console.install 2012-02-21 14:27:16 +0000
53+++ debian/nova-console.install 2012-03-22 20:24:19 +0000
54@@ -1,2 +1,1 @@
55 usr/bin/nova-console
56-usr/bin/nova-consoleauth

Subscribers

People subscribed via source and target branches