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
=== modified file 'debian/changelog'
--- debian/changelog 2012-03-20 15:10:40 +0000
+++ debian/changelog 2012-03-22 20:24:19 +0000
@@ -1,3 +1,11 @@
1nova (2012.1~rc1-0ubuntu2) precise; urgency=low
2
3 * debian/control: Add Breaks/Replaces to nova-consoleauth, update
4 description, nova-console Recommends nova-consoleauth
5 * debian/nova-console.install: Remove nova-consoleauth
6
7 -- Adam Gandelman <adamg@canonical.com> Thu, 22 Mar 2012 11:31:35 -0700
8
1nova (2012.1~rc1-0ubuntu1) precise; urgency=low9nova (2012.1~rc1-0ubuntu1) precise; urgency=low
210
3 [ Adam Gandelman ]11 [ Adam Gandelman ]
412
=== modified file 'debian/control'
--- debian/control 2012-03-19 22:17:04 +0000
+++ debian/control 2012-03-22 20:24:19 +0000
@@ -500,6 +500,7 @@
500Package: nova-console500Package: nova-console
501Architecture: all501Architecture: all
502Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}502Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
503Recommends: nova-consoleauth (>= 2012.1~rc1-0ubuntu2)
503Description: OpenStack Compute - Console504Description: OpenStack Compute - Console
504 OpenStack is a reliable cloud infrastructure. Its mission is to produce505 OpenStack is a reliable cloud infrastructure. Its mission is to produce
505 the ubiquitous cloud computing platform that will meet the needs of public506 the ubiquitous cloud computing platform that will meet the needs of public
@@ -522,6 +523,8 @@
522Package: nova-consoleauth523Package: nova-consoleauth
523Architecture: all524Architecture: all
524Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}525Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
526Breaks: nova-console (<< 2012.1~rc1-0ubuntu2)
527Replaces: nova-console (<< 2012.1~rc1-0ubuntu2)
525Description: OpenStack Compute - Console Authenticator528Description: OpenStack Compute - Console Authenticator
526 OpenStack is a reliable cloud infrastructure. Its mission is to produce529 OpenStack is a reliable cloud infrastructure. Its mission is to produce
527 the ubiquitous cloud computing platform that will meet the needs of public530 the ubiquitous cloud computing platform that will meet the needs of public
@@ -537,9 +540,9 @@
537 (SQLite, MySQL, and PostgreSQL, for instance), different types of user540 (SQLite, MySQL, and PostgreSQL, for instance), different types of user
538 databases (LDAP or SQL), etc.541 databases (LDAP or SQL), etc.
539 .542 .
540 This package provides the console server. This enables the use of consoles543 This package provides the authentication service for nova-console. It grants
541 to be used along with XVP and XenServer. It is a publically reachable544 user requests for console access based on tokens in the identity service and
542 component which proxies access to VNCs running on compute nodes.545 allows access to virtual consoles via a browser.
543546
544Package: nova-doc547Package: nova-doc
545Architecture: all548Architecture: all
546549
=== modified file 'debian/nova-console.install'
--- debian/nova-console.install 2012-02-21 14:27:16 +0000
+++ debian/nova-console.install 2012-03-22 20:24:19 +0000
@@ -1,2 +1,1 @@
1usr/bin/nova-console1usr/bin/nova-console
2usr/bin/nova-consoleauth

Subscribers

People subscribed via source and target branches