← Back to branch summary

~0x44/nova/bug838466

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to debian/nova-common.dirs

Committer: Todd Willey
Date: 2010-07-15 04:21:17 UTC
mfrom: (131.1.4)
Revision ID: git-v1:fb2ea2cafd67fc1ef67edc969a1edf3a1d2fd7f7

fix merge errors

files added:
bin/dhcpleasor.py

debian/nova-api.conf

debian/nova-common.dirs

debian/nova-compute.conf

debian/nova-manage.conf

debian/nova-objectstore.conf

debian/nova-objectstore.links

debian/nova-objectstore.nginx.conf

debian/nova-volume.conf

nova/compute/interfaces.template

files modified:
README

bin/nova-api

bin/nova-compute

bin/nova-manage

debian/changelog

debian/control

debian/nova-api.init

debian/nova-api.install

debian/nova-common.install

debian/nova-compute.init

debian/nova-compute.install

debian/nova-objectstore.init

debian/nova-objectstore.install

debian/nova-volume.init

debian/nova-volume.install

docs/conf.py

docs/getting.started.rst

nova/adminclient.py

nova/auth/fakeldap.py

nova/auth/users.py

nova/cloudpipe/pipelib.py

nova/compute/disk.py

nova/compute/linux_net.py

nova/compute/model.py

nova/compute/network.py

nova/compute/node.py

nova/crypto.py

nova/datastore.py

nova/endpoint/admin.py

nova/endpoint/api.py

nova/endpoint/cloud.py

nova/flags.py

nova/rpc.py

nova/tests/api_unittest.py

nova/tests/network_unittest.py

nova/tests/objectstore_unittest.py

nova/tests/storage_unittest.py

nova/tests/validator_unittest.py

nova/utils.py

nova/volume/storage.py

run_tests.py

smoketests/flags.py

smoketests/novatestcase.py

smoketests/smoketest.py

Show diffs side-by-side

added added

removed removed

debian/nova-common.dirs

1

etc/nova

2

var/lib/nova/buckets

3

var/lib/nova/CA

4

var/lib/nova/CA/INTER

5

var/lib/nova/CA/newcerts

6

var/lib/nova/CA/private

7

var/lib/nova/CA/reqs

8

var/lib/nova/images

9

var/lib/nova/instances

10

var/lib/nova/keys

11

var/lib/nova/networks

Older »