« back to all changes in this revision
Viewing changes to contrib/puppet/puppet.conf
- Committer: Ryan Lane
- Date: 2010-11-24 15:46:32 UTC
- mfrom: (382.48.1 trunk)
- Revision ID: laner@controller-20101124154632-zh7kwjuyyd02a2lh
Merge from trunk
- files added:
- .mailmap
- contrib
- contrib/puppet
- contrib/puppet/files
- contrib/puppet/files/etc
- contrib/puppet/files/etc/default
- contrib/puppet/files/etc/libvirt
- contrib/puppet/files/etc/lvm
- contrib/puppet/files/production
- contrib/puppet/manifests
- contrib/puppet/manifests/classes
- contrib/puppet/templates
- contrib/puppet/templates/production
- doc/build
- doc/ext
- doc/source/_ga
- doc/source/_theme
- doc/source/adminguide
- doc/source/adminguide/distros
- doc/source/api
- doc/source/devref
- doc/source/images
- doc/source/images/rabbit
- doc/source/man
- files removed:
- doc/build
- nova/image/services
- nova/image/services/glance
- files renamed:
- doc/source/Makefile => doc/Makefile
- doc/source/binaries.rst => doc/source/adminguide/binaries.rst
- doc/source/getting.started.rst => doc/source/adminguide/getting.started.rst
- doc/source/architecture.rst => doc/source/devref/architecture.rst
- doc/source/auth.rst => doc/source/devref/auth.rst
- doc/source/compute.rst => doc/source/devref/compute.rst
- doc/source/fakes.rst => doc/source/devref/fakes.rst
- doc/source/network.rst => doc/source/devref/network.rst
- doc/source/nova.rst => doc/source/devref/nova.rst
- doc/source/volume.rst => doc/source/devref/volume.rst
- nova/image/services/glance/__init__.py => nova/image/glance.py
- nova/api/ec2/images.py => nova/image/s3.py
- files modified:
- Authors
added
removed
contrib/puppet/puppet.conf
