Merge "Reduce duplicate definitions about quota sets"
Pin the cinderclient version.

Fixes bug 1156817.

Change-Id: I56f41b5499ac55dbdb7bf68e4692f0ba04751455
Merge "Disable LB panel by default; allow UUID for Sec Group ID."
Check if volume service is enabled in quota update

Quotas fail to load on the project quota update form in the
admin dashboard when the volume service is disabled.

Change the get_default_quota_data and get_tenant_quota_data functions
to always check for a disabled volume service, so we don't have to
remember to do it every time we call the functions.

Moved *QUOTA_FIELDS to usage/quotas.py to avoid a circular import.

Fixes bug #1155878.

Change-Id: I7150c4d7c318b6199ff03825cf5d770c7741b379
Merge "Pin the cinderclient version."
Merge "Check if volume service is enabled in quota update"
Handle None protocol in security group rule table

Default Quantum security groups come in with a protocol of None via
nova. Horizon chokes when it tries to uppercase what it expects to be
a unicode string.

Replace None with 'Any' when displaying the value.

Fixes bug 1156922.

Change-Id: I94a534e829ecdbe75f785eb8fc750260aacd6dfc
Merge "Improve UX around "unauthorized" API exceptions."
Merge "Implement configurable auto-fade for alerts messages."
Updated translations from transifex for Grizzly RC.

Fixes bug 1157308.

Change-Id: I06d4e9834d66d834e9e636ffcd80ae5e4afa34d7
Adds Grizzly release notes.

Fixes bug 1157348.

Change-Id: Ic3a7725d4ef489033d98d48d21671b2d982def8e
Bump version to 2013.2.

Change-Id: I0eb60bb12a63e7ccf2623fb9aeaf9a9f84fda24e
Remove note on theming from release notes.

Change-Id: If7964f37eab3ada01d6efc8e6ec8d6f959d7151e
Merge "Bump version to 2013.2."
Fix some not-consistent titles for virtual routers management

- Replace "Detail" by "Details"
- Replace "Create a router" by "Create router" (like other OpenStack projects)

Fix bug #1120551

Change-Id: I8b6e01b4400a044dfab7322abb251fe034ae010b
Fix adding security groups to an existing instance

Commit 4c34f5f1e8c66e4a865cf7996b283509feb91b71 introduced a
regression making it impossible to add a security group to
an existing instance.

In the javascript membership module, make sure new members are still
assigned the default role even if the role dropdown is not displayed
(as is the case for the instance security group add/remove view).

Fixes bug 1158037.

Change-Id: I986f7296e97a08d5e9141fe0739d4e028e066fc1
Tiny Mistake in Document

    Modify "defaul.t" to "default."

Change-Id: I2e4e18bbb2b526fd7dcd63cfe42a31050e3c9983
Made default values in templates translatable.

Fixes bug 1138183

Change-Id: I4a5d1f89e94b547bb0850020cb3fd4c03ec30179
Remove inheritance of More action on first action

More indicator in the action dropdown should not inherit the class
of the first action. Any custom behavior attached to the first action
will also be inherited by More.

Example: If the first action had btn-danger, the More button become
red too. This might give the user the impression that More is also
a dangerous operation.

Fixes bug 1158419

Change-Id: Id078b738ba635ec47d2f32cde1917295f3ca5a79
Add flavor name regex validation to match nova.

Fixes bug 1148372

Change-Id: Ia1f4d974ddac6cd22c0b8979e98b2ea8f31deb21