Merge lp:~soren/nova/update-setup-py into lp:~hudson-openstack/nova/trunk

Proposed by Soren Hansen
Status: Merged
Approved by: Eric Day
Approved revision: 360
Merged at revision: 363
Proposed branch: lp:~soren/nova/update-setup-py
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 37 lines (+11/-3)
1 file modified
MANIFEST.in (+11/-3)
To merge this branch: bzr merge lp:~soren/nova/update-setup-py
Reviewer Review Type Date Requested Status
Eric Day (community) Approve
Devin Carlen (community) Approve
Review via email: mp+38617@code.launchpad.net

Description of the change

Refresh MANIFEST.in to make the tarball include all the stuff that belongs in the tarball.

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

approve

review: Approve
Revision history for this message
Eric Day (eday) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2010-07-28 21:37:58 +0000
3+++ MANIFEST.in 2010-10-16 08:07:02 +0000
4@@ -1,22 +1,30 @@
5-include HACKING LICENSE run_tests.py run_tests.sh
6+include HACKING LICENSE run_tests.py run_tests.sh
7 include README builddeb.sh exercise_rsapi.py
8-include ChangeLog
9+include ChangeLog MANIFEST.in pylintrc
10 graft CA
11 graft doc
12 graft smoketests
13 graft tools
14+include nova/api/openstack/notes.txt
15 include nova/auth/novarc.template
16 include nova/auth/slap.sh
17 include nova/cloudpipe/bootscript.sh
18 include nova/cloudpipe/client.ovpn.template
19 include nova/compute/fakevirtinstance.xml
20 include nova/compute/interfaces.template
21-include nova/compute/libvirt.xml.template
22+include nova/virt/interfaces.template
23+include nova/virt/libvirt.qemu.xml.template
24+include nova/virt/libvirt.uml.xml.template
25+include nova/virt/libvirt.xen.xml.template
26 include nova/tests/CA/
27 include nova/tests/CA/cacert.pem
28 include nova/tests/CA/private/
29 include nova/tests/CA/private/cakey.pem
30 include nova/tests/bundle/
31 include nova/tests/bundle/1mb.manifest.xml
32+include nova/tests/bundle/1mb.no_kernel_or_ramdisk.manifest.xml
33 include nova/tests/bundle/1mb.part.0
34 include nova/tests/bundle/1mb.part.1
35+include plugins/xenapi/README
36+include plugins/xenapi/etc/xapi.d/plugins/objectstore
37+include plugins/xenapi/etc/xapi.d/plugins/pluginlib_nova.py