OpenStack Compute (nova)

Merge lp:~zulcss/nova/nova-fix-xcp into lp:~openstack-ubuntu-testing/nova/grizzly

  1. nova-fix-xcp
  2. Merge into grizzly
Proposed by Chuck Short on 2012-12-05
Status: Merged
Approved by: Yolanda Robla on 2012-12-05
Approved revision: 506
Merged at revision: 506
Proposed branch: lp:~zulcss/nova/nova-fix-xcp
Merge into: lp:~openstack-ubuntu-testing/nova/grizzly
Diff against target: 41 lines (+7/-7)
3 files modified
debian/changelog (+1/-0)
debian/nova-compute-xcp.lintian-overrides (+0/-1)
debian/nova-xcp-plugins.install (+6/-6)
To merge this branch: bzr merge lp:~zulcss/nova/nova-fix-xcp
Reviewer Review Type Date Requested Status
Yolanda Robla 2012-12-05 Approve on 2012-12-05
Review via email: mp+138257@code.launchpad.net

Description of the Change

Fix nova-xcp-plugins so it isn't an empty package.

To post a comment you must log in.
Yolanda Robla (yolanda.robla) wrote :

Not sure why the diff is showing anything on debian/nova-xcp-plugins.install as there doesn't seem to be any change?

Yolanda Robla (yolanda.robla) :
review: Approve

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-12-03 16:03:17 +0000
3+++ debian/changelog 2012-12-05 17:23:47 +0000
4@@ -3,6 +3,7 @@
5 * New upstream release.
6 * debian/patches/ubuntu-show-tests.patch: Dropped no longer needed.
7 * debian/rules: Run nosetests running in verbose.
8+ * debian/nova-xcp-plugins.install: Fix xcp-plugins empty packages
9
10 -- Chuck Short <zulcss@ubuntu.com> Thu, 29 Nov 2012 10:56:31 -0600
11
12
13=== removed file 'debian/nova-compute-xcp.lintian-overrides'
14--- debian/nova-compute-xcp.lintian-overrides 2012-11-30 19:40:37 +0000
15+++ debian/nova-compute-xcp.lintian-overrides 1970-01-01 00:00:00 +0000
16@@ -1,1 +0,0 @@
17-nova-compute-xcp: empty-binary-package
18
19=== modified file 'debian/nova-xcp-plugins.install'
20--- debian/nova-xcp-plugins.install 2012-02-29 02:55:07 +0000
21+++ debian/nova-xcp-plugins.install 2012-12-05 17:23:47 +0000
22@@ -1,6 +1,6 @@
23-plugins/xenserver/xenapi/etc/xapi.d/plugins/agent /usr/lib/xcp/plugins
24-plugins/xenserver/xenapi/etc/xapi.d/plugins/glance /usr/lib/xcp/plugins
25-plugins/xenserver/xenapi/etc/xapi.d/plugins/migration /usr/lib/xcp/plugins
26-plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py /usr/lib/xcp/plugins
27-plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost /usr/lib/xcp/plugins
28-plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py /usr/lib/xcp/plugins
29+plugins/xenserver/xenapi/etc/xapi.d/plugins/agent /usr/lib/xcp/plugins
30+plugins/xenserver/xenapi/etc/xapi.d/plugins/glance /usr/lib/xcp/plugins
31+plugins/xenserver/xenapi/etc/xapi.d/plugins/migration /usr/lib/xcp/plugins
32+plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py /usr/lib/xcp/plugins
33+plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost /usr/lib/xcp/plugins
34+plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py /usr/lib/xcp/plugins
35
36=== removed directory 'plugins'
37=== removed directory 'plugins/xenserver'
38=== removed directory 'plugins/xenserver/xenapi'
39=== removed directory 'plugins/xenserver/xenapi/etc'
40=== removed directory 'plugins/xenserver/xenapi/etc/xapi.d'
41=== removed directory 'plugins/xenserver/xenapi/etc/xapi.d/plugins'

Subscribers

People subscribed via source and target branches