Nail tox's pep8 dependency to 1.0.1

Avoid failures due to new warnings in 1.1

Change-Id: I66bc6eabeba5cc14525b364d645ae6f74a85fd72
Bump version to 2012.1.1

Set version to 2012.1.1, but with final=False

See http://wiki.openstack.org/StableBranchRelease

Change-Id: I71deeb988402955ccdc7bc5bda65e7e36412962e
Kill glance-api child workers on SIGINT

Fixes bug 978130

Previously glance-api configured to run multiple child
workers went in a respawn tail-spin when the parent is
interrupted with crtl+c.

This is now avoided by terminating the process group when
SIGINT is received, in the same way as SIGTERM is handled.

Change-Id: Ieca90f45e07cc3645a997bba493e0b9a9f08a470
Suppress pagination on non-tty glance index.

Fixes bug 978610.

Avoid the 'Fetch next page? [Y/n]' prompt interfering with
redirected output.

The native glance CLI will soon be superceeded by the new
python-glanceclient, however this patch could still be useful
to propogate from master to the stable diablo/essex branches.

Change-Id: I16bc6156d7c7e9ed27aabcaa51211060ec24a824
012_id_to_uuid: Also convert ramdisk + kernel ids

The original migration converts numerical IDs to UUIDs.  It updates
image_members and image_properties that reference image_id, but stops
short of updating actual properties that reference the new UUIDs,
specifically kernel_ids and ramdisk_ids.  This breaks launching
of instances in Nova whos images are associated with a kernel and/or rd.

Also, this fixes an issue when migrating against non-sqlite
databases where the actual conversion is executed twice.

Fixes bug 975655
Fixes bug 975651

Update: Only update kernel_ids and ramdisk_ids in image_properties
        when converting to UUIDs

Change-Id: I76ecabc5ee266e2e9765740721e8ec1722cc5a7c
fix side effects from seekability test on input file

Fixes Bug #1007093

Mixing use of os.lseek(fileno, 0, os.SEEK_SET) with
file.seek seems to cause problems when reading data
with file.read

Change-Id: Ia96ce9bbdc93a1a8c6169d85b99187f8cd7b2fdc
Fix to not use deprecated response.environ any more.

WebOb 1.2 doesn't auto-set the response environment. There was only one place
in Glance that was using this, so it was changed in favor of the stable API
that has always been there: response.request.environ.

This change fixes bug #1010560.

Change-Id: I2e58bf32970c95d25cad0a35ee38b9540483eef0
Add metadata_encryption_key to glance-cache.conf.

Fixes LP Bug #1012752.

Change-Id: I802583e2766cd1533223638259e57e44b39448eb
Fixes bug 997565.

Modified the help text for 'add' image command.

Change-Id: I32cbd36a3a4ef6368f9128ac0ab4a8efbd14ff2e
Merge "012_id_to_uuid: Also convert ramdisk + kernel ids" into stable/essex
Merge "fix side effects from seekability test on input file" into stable/essex
Merge "Fix to not use deprecated response.environ any more." into stable/essex
Merge "Kill glance-api child workers on SIGINT" into stable/essex
Merge "Add metadata_encryption_key to glance-cache.conf." into stable/essex
Merge "Suppress pagination on non-tty glance index." into stable/essex
Merge "Fixes bug 997565." into stable/essex
Avoid thread creation prior to service launch.

It appears that the thread serving out the fake HTTP endpoint used
in the copy-from tests is causing intermittent hangs in the launched
glance service processes. These hangs manifest as calls to futex(2)
that never return, and occur almost daily in Smokestack.

The background to the thread/fork mismatch is explained in this
blog post:

 http://rachelbythebay.com/w/2011/06/07/forked

We avoid the issue by delaying the thread creation until after the
service processes have been launched by the testcase.

Change-Id: I68c6f1735e5001641994ed4f84ad879397ba8713
Final versioning for 2012.1.1

Change-Id: Ibc6bf78ac18873be689f958e575ff21bbff32f22
Don't access the net while building docs

(Note this hasn't been submitted upstream)

Change-Id: I42c6e3a5062db209a0abe00cebc04d383c79cbcb
(cherry picked from commit f2b4bb4e45afcc178200966193a7b87401c534d7)
Support DB auto-create suppression.

Adds a new boolean config option, db_auto_create, to allow the
DB auto-creation be suppressed on demand. This defaults to True
for now to maintain the pre-existing behaviour, but should be
changed to False before the Folsom release.

The 'glance-manage db_sync' command will now create the image*
tables if the DB did not previously exist. The db_auto_create
flag is irrelevant in that case.

The @glance.tests.function.runs_sql annotation is now obsolete
as the glance-api/registry services launched by functional tests
must now all run against an on-disk sqlite instance (as opposed
to in-memory, as this makes no sense when the DB tables are
created in advance).

Change-Id: I05fc6b3ca7691dfaf00bc75a0743c921c93b9694

Conflicts:

	glance/tests/functional/__init__.py
	glance/tests/functional/test_sqlite.py
	glance/tests/functional/v1/test_api.py
	glance/tests/functional/v2/test_images.py