Bump version to 2012.2.4

Set version to 2012.2.4, but with final=False

Change-Id: I9dab1dc62e41cdb4143a3c8083e65c4b13a22eb4
Accepts UUID as an ID of Floating IP

Fixes bug 1052561.

In Quanutm, Floating IPs are identified by UUID instead of integer ID.
After quantum-nova integration for FLoating IP has been implemented,
Horizon also needs to accept UUID style of ID for Floating IP.

Change-Id: I6ed919cbbc818c97cecef2fe3a91c8e5a7ac76e0
(cherry picked from commit 7ab5ace768797f56bf7e1c846fca0f1d40ed6086)
Prevent the user from creating a single IP address sized network

If the user doesn't specify a mask when creating a subnet, the mask
defaults to /32 (IPv4) or /128 (IPv6) making it impossible to allocate
an IP address when later launching an instance. This patch prevents
creating a subnet with such a small mask.

Fixes bug #1102504

Change-Id: I4962e0a416b8ec9aca013e41783994f65c22a989
Fix flavorid calculation for new flavors.

Change-Id: I620824e82ffbb89c91dacce19509d63b6e1eb7d4
Fixes: bug #1116913
Add UTC offset information to the timezone

In the User Settings, indicate besides the timezone name what the
actual timezone/UTC offset is.

Fixes bug 1103003

Change-Id: I8070df2bc0380da1555c40dc9394895fbfde6848
Merge "Add UTC offset information to the timezone" into stable/folsom
Return a friendly error at flavor creation

When trying to create a flavor with an Id/Name that is already in use, the
operation fails and no error message is being displayed

Change-Id: I92db8b52bc4e63e5e5ce4d90169944e484baeddd
Fixes: bug #1079155
(cherry picked from commit dcda6940263a43344bf98aa1776cce34d25ff927)
Improve error message when the default role doesn't exist

To add members to a project, Horizon requires a default role to exist
in Keystone.  This provides a clearer error message when the role
cannot be found.

Fixes bug #1108063

Change-Id: I0e3cd4cb96c7896c675055671e0875840b1a41d3
If a user only has 1 keypair, this keypair should be selected by default

When Launching a new instance, it's easy to forget to select a keypair
as it's hidden in another tab. This mitigates the issue by selecting a
keypair automatically when there is only one.

Fixes bug #1125124

Change-Id: I04cd6850b4b5f0901d2f9035af8df53cfb67f8c5
pin django to 1.4.x stream

django 1.5 just released in the last hour, and there is a
compatibility issue with it and horizon causing gate failures.

Pin this so that we can get back to business and let the horizon
team address django 1.5 when it makes sense to them.

Change-Id: I6ddf9623f8a4719b1cb82b118c1876373051fd28
(cherry picked from commit 0d53dc7063003fa7f02c030fd1631e0cd553d22a)
Prevent creating a single IP address sized network (network details)

The backport for bug #1102504 was incomplete and did not cover
providing the same error message when creating a subnet from the
network details page.

This additional patch is not needed on the master branch, as subnet
creation was refactored during the grizzly cycle.

Fixes bug #1149890

Change-Id: I451e37c347a6540825ad9bf66d4a32c39601dd19
Dynamically size the noVNC iframe, fix typos in copy

The iframe for the noVNC console is too small for some users who
like to use GUI on the console.  Leaving the sizes off completely
and letting the browser figure it out causes hilarity to ensue, so
explicitly set the height and width to quasi-sensible values.

Also, the "unavailable" error says "unavailabe"  Fixed.

Fixes Bug 1050316

Addendum:

add an identifier to the iframe rather than using the auto-generated selector

Cherry-picked and squashed from grizzly commits: 68db72b95f and a37779c47d

Change-Id: I17cfa97cdc69f4b58e18d02451da2197c663e0d3
Improve error message when network creation fails

Enhanced error messages extracted from grizzly commit 31d55e503d

Fixes bug #1152619

Change-Id: I318eddaed3cbd352fe7ed7e47a196f29111f62f8
Merge "Improve error message when the default role doesn't exist" into stable/folsom
Merge "Accepts UUID as an ID of Floating IP" into stable/folsom
Correctly mock keystoneclient.Client.auto_token property with Mox

Recent Mox doesn't stub out class properties any more (check
https://code.google.com/p/pymox/issues/detail?id=11), so we have to do
that manually. Avoids the following error:

FAIL: test_get_default_role
(openstack_dashboard.test.api_tests.keystone_tests.RoleAPITests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/root/Projects/openstack/horizon/openstack_dashboard/test/api_tests/keystone_tests.py", line 76, in test_get_default_role
    keystoneclient = self.stub_keystoneclient()
  File "/root/Projects/openstack/horizon/openstack_dashboard/test/helpers.py", line 280, in stub_keystoneclient
    self.keystoneclient = self.mox.CreateMock(keystone_client.Client)
  File "/usr/lib/python2.7/site-packages/mox.py", line 258, in CreateMock
    new_mock = MockObject(class_to_mock, attrs=attrs)
  File "/usr/lib/python2.7/site-packages/mox.py", line 556, in __init__
    attr = getattr(class_to_mock, method)
  File "/usr/lib/python2.7/site-packages/mox.py", line 608, in __getattr__
    raise UnknownMethodCallError(name)
UnknownMethodCallError: Method called is not a member of the object: Method called is not a member of the object: auth_token
>>  raise UnknownMethodCallError('auth_token')

Change-Id: I54fd0de298dc66344470147d9bcec6b62baf8297
(cherry picked from commit 1e867700415b17c29056fb55069b6a3e2b22cf1b)
Fixes bug 1161901
Merge "Return a friendly error at flavor creation" into stable/folsom
Merge "Fix flavorid calculation for new flavors." into stable/folsom
Merge "Dynamically size the noVNC iframe, fix typos in copy" into stable/folsom
Merge "If a user only has 1 keypair, this keypair should be selected by default" into stable/folsom