Viewing all changes in revision 395.
- Committer: rlane at wikimedia
- Date: 2011-01-20 00:46:04 UTC
- mfrom: (382.1.209 nova)
- Revision ID: rlane@wikimedia.org-20110120004604-xum1zjbfvbndtqhw
Merge from trunk
- files added:
- babel.cfg
- contrib/boto_v6
- contrib/boto_v6/ec2
- locale
- nova/console
- nova/db/sqlalchemy/migrate_repo
- nova/db/sqlalchemy/migrate_repo/versions
- nova/tests/glance
- tools/ajaxterm
- files removed:
- bin/nova-api
- files renamed:
- bin/nova-api-paste => bin/nova-api
- nova/api/openstack/sharedipgroups.py => nova/api/openstack/shared_ip_groups.py
- nova/tests/api/openstack/test_sharedipgroups.py => nova/tests/api/openstack/test_shared_ip_groups.py
- nova/compute/disk.py => nova/virt/disk.py
- files modified:
- .mailmap
expand all
collapse all
added
removed
