html escape the console log in refresh

fixes bug 977944

(cherry picked from commit ab2e27522aaeb0268fcc121bd3eff5a4485f313c)

Change-Id: Ic6135ebc58b6c45d6336f0833717086e43d7cccb
Add distribute to test-requires.

Currently glance (which is required for testing by keystone because
there is no python-glanceclient yet) requires distribute>=0.6.24,
but it can't be installed as a dependency of a dependency.  Requiring
it explicitly here should help.

Install test-requires first, otherwise distribute doesn't get properly set.

Install distribute manually until we can re-address venv creation.

Align webob version to the other projects due to version conflicts.

Change-Id: Iac0b6860c600fbf230cf4f602ce1b76c68fcb7cd
Merge "html escape the console log in refresh" into stable/essex
Corrects the ImportError handling for the override mechanism.

Fixes bug 973836.

Change-Id: Ide849ca230d1e07c7242268d32f06600e09c6746
Fixes lp978896 -- Session fixation security fix

Rotates session tokens on logout, and properly clears sessions
to prevent data leakage.

Change-Id: Id11054e852b8c8a386756e9de980cb5eff64f228
makes api return default endpoint types. fixes bug 994151

Change-Id: I409a5415ffeb21ea81ecf540caa2cd5ac3336d90
This is a backport which fixes the issue with images being marked public
when edited. This is fixed in Folsom by: https://github.com/openstack/horizon/commit/0b94c431ab8e510b5fd4e7d1e8719c7d2055fa0f

Fixes bug 988633

Change-Id: Ia22501c2a3daac7e84c10039dd5857612e5156f4
Change Instance to Image for image detail page.

Fixes bug 985844

Change-Id: Ifc442aa343079c4a332bbea4d306e4cdf700821a
Made quota names prettier. Fixed bug 979417.

Change-Id: Iaf87fa6d18d4c7c9309d1e60c3d8daf77f7ddfca
Merge "makes api return default endpoint types. fixes bug 994151" into stable/essex
Merge "Made quota names prettier. Fixed bug 979417." into stable/essex
Added instance name for volume attachment

Fixes bug 974916.

The instance is displayed in the same way
as it is in volume detail page.

Change-Id: I33ee44befa846767d5556bc56695306951414dc2
Added a new attribute - display_choices
to Column class, for substituting the
display value of the statuses provided
by Nova to some more meaningful ones
in the instance table.

Fixes bug 997374

Change-Id: I18560868435b4cbc42670e3fc9c0bc83ebf9fda4
	horizon/dashboards/nova/instances_and_volumes/instances/tests.py
Add tox.ini file.

Fixed pep8 run, which always return success. And one 1.1 pep8 error.

Change-Id: I2f1dd7c61b7fd0816bf7697f74e306d17f908fa5
Fix stable/essex (2012.1.1) versioning

Fix stable/essex branch versioning that should have been set to 2012.1.1
when the branch was first used (with FINAL=False). FINAL should be set
to True when we want to cut the stable branch release.

Change-Id: Iea07571b7b9175db1176ce629e325ee95947d8e8
Final versioning for 2012.1.1

Change-Id: Ibfd86df27c531ec2b3d0bb4b0a7feeef46a2989d
Merge "Added a new attribute - display_choices to Column class, for substituting the display value of the statuses provided by Nova to some more meaningful ones in the instance table." into stable/essex
Backport of Folsom Glance pagination review.

Fixes 981252.

Change-Id: I9506c0ffa6291ec490857d5afca3f20cce1c27a7
Merge "Added instance name for volume attachment" into stable/essex
Use publicURLs for generated endpoints for ec2rc.sh

Fixes bug 994297

Change-Id: Icbc0b3ca327d87754bac291b0d179faacdabc7aa