12306 Commits

Author SHA1 Message Date
Jenkins
c40fe6b31f Merge "don't need to 'import identity' as the same name 'identity'" 2017-02-15 02:31:02 +00:00
Jenkins
9c545aeb68 Merge "Fix some annotation errors" 2017-02-15 01:50:20 +00:00
Liao Zhuodi
e1beeb7217 don't need to 'import identity' as the same name 'identity'
Change-Id: Ib8c0a457f1358c64a01e3cf76e9666ab3e4ab809
2017-02-15 09:26:37 +08:00
yuhui_inspur
f8bc0d65cd Fix some annotation errors
Change-Id: Ib3f08c079b29c9ad0e3c41697da6744b9c17e1e6
2017-02-15 00:37:45 +00:00
Jenkins
392ddec13b Merge "Disentangle domain context from effective domain" 2017-02-15 00:26:00 +00:00
Jenkins
a1d8e16907 Merge "SCSS refactor for shared sort list UI" 2017-02-14 23:10:51 +00:00
OpenStack Proposal Bot
d07a02a60c Imported Translations from Zanata
For more information about this automatic import see:
http://docs.openstack.org/developer/i18n/reviewing-translation-import.html

Change-Id: I9235deebf45edbda2af467bffce627481beb1671
2017-02-14 07:44:33 +00:00
Jenkins
f313437f9f Merge "Add Angular keystone role edit action" 2017-02-14 04:21:54 +00:00
Jenkins
a265d8cd64 Merge "Add Angular keystone role deletion action" 2017-02-14 04:09:57 +00:00
Jenkins
c6313ed99a Merge "Add Angular keystone role creation action" 2017-02-14 04:08:20 +00:00
Jenkins
0569f75eaf Merge "clean unused imports" 2017-02-13 19:02:13 +00:00
Jenkins
2e7a0ea7a4 Merge "Fixes inconsistency in Stacks filter label" 2017-02-13 19:01:14 +00:00
OpenStack Proposal Bot
f0e147d3d8 Updated from global requirements
Change-Id: Icb55169df894ed742e7337597a1d312f4b66f9d9
2017-02-13 15:12:09 +00:00
Radomir Dopieralski
8b839938bc Disentangle domain context from effective domain
Since the existence of a domain token was equivalent with having
selected a domain context with Keystone V2, some code confuses the
two. This is no longer true for Kestone V3, so we have to separate
the two concepts and use domain context when we mean the domain
context.

Close-bug: #1661537

Change-Id: Ifa66d8c397e34d16a4534e7216eb11c752699505
2017-02-13 11:40:57 +01:00
Jenkins
d2ef3f3b0c Merge "Imported Translations from Zanata" 2017-02-12 20:40:46 +00:00
liaozd
296d48074d clean unused imports
Change-Id: I9db0bbe3d24fb04e647fcfca1a3a746df006f85c
2017-02-12 17:58:11 +08:00
OpenStack Proposal Bot
0a1cdaefe1 Updated from global requirements
Change-Id: Ie0e48dc9be9a24d0737a398064c65777ee35f79b
2017-02-11 17:42:38 +00:00
OpenStack Proposal Bot
eca3c28c29 Imported Translations from Zanata
For more information about this automatic import see:
http://docs.openstack.org/developer/i18n/reviewing-translation-import.html

Change-Id: I394a4522ebe45cb22609946c06c0f1fba9dcd831
2017-02-11 08:20:35 +00:00
Jenkins
b7730aba0d Merge "Use "Default", "Value" and "DefaultValue" for Heat parameters" 2017-02-10 11:30:36 +00:00
OpenStack Proposal Bot
612d9aeb3c Imported Translations from Zanata
For more information about this automatic import see:
http://docs.openstack.org/developer/i18n/reviewing-translation-import.html

Change-Id: Ibea83c8bea2ce4dbe1032399a9e1186c8d4d9a98
2017-02-10 08:17:03 +00:00
OpenStack Proposal Bot
21ff99211e Updated from global requirements
Change-Id: I4d0a95b3c80d6f49894e4bdfeb8ff51d31024c3e
2017-02-10 05:49:24 +00:00
Jenkins
f0dda9ac0d Merge "Updated from global requirements" 2017-02-09 23:37:50 +00:00
OpenStack Proposal Bot
ed772a9097 Updated from global requirements
Change-Id: I6cfe915420e6b2bcb18a3aac99981f1451d87308
2017-02-09 14:05:36 +00:00
gugl
bfbaa2c2bf Add vhd and vhdx disk format for volume upload image
Current volume upload image action doesn't support vhd and vhdx
disk format. Added them into the default settings and and volume
upload image.

Close-Bug: #1586915

Change-Id: I18fdd411f716377239962b1d920ba447c101d66f
2017-02-09 04:45:59 -08:00
Radomir Dopieralski
39e2bb784c Use "Default", "Value" and "DefaultValue" for Heat parameters
It seems there has been changes in the Heat API, and it no longer
returns the default value for a parameter in the "Default" key, it
has been instead renamed to "DefaultValue" and later to "Value".
This patch makes it use all those key names, whichever exists.

Change-Id: Ia86d8d79fcd48974ffe3fecf21a7153bf2ba6a9a
2017-02-09 12:01:07 +01:00
Jenkins
dd097d41f5 Merge "Add info on key-value of volume QoS spec" 2017-02-08 22:58:54 +00:00
Jenkins
136214f7b4 Merge "[Trivial]Fix some type errors" 2017-02-08 22:37:56 +00:00
Jenkins
c742d4e74e Merge "Correct some spelling errors" 2017-02-08 22:27:35 +00:00
Jenkins
6fa0a90318 Merge "Make shared image text less confusing for Glance v2" 2017-02-08 20:19:22 +00:00
OpenStack Proposal Bot
385240c95b Imported Translations from Zanata
For more information about this automatic import see:
http://docs.openstack.org/developer/i18n/reviewing-translation-import.html

Change-Id: I40c5e42e1b27dfb2f8d1ddc5913b129fb49f9b4e
2017-02-08 13:57:01 +00:00
Jenkins
90abe58378 Merge "Add description of Horizon's Core Team" 2017-02-08 12:01:06 +00:00
Jenkins
c37797faf0 Merge "Add step to bump global-requirements for xstatic" 2017-02-08 11:57:37 +00:00
yuhui_inspur
9f8c768e47 [Trivial]Fix some type errors
Change-Id: Ibdefd786222876b976b3cac2bc244bcea5f7cf14
2017-02-07 18:52:32 -08:00
yuhui_inspur
f85e4daaf1 Correct some spelling errors
Change-Id: I592d84d70a3c24fcbed547a3a361da2a2971c3dc
2017-02-07 18:25:33 -08:00
Richard Jones
12d769b203 Add step to bump global-requirements for xstatic
Change-Id: I2cdeecbcc309f74745665fd077f2ac66c536fdb7
2017-02-08 12:01:32 +11:00
Jenkins
3c1379b5c0 Merge "Small UI change in User Credentials Details modal" 2017-02-07 09:01:05 +00:00
Jenkins
8ce5741bb1 Merge "Check if user.token attribute exists" 2017-02-07 01:16:04 +00:00
Jenkins
d8d5e2be93 Merge "Fix ignored timezone value from local_settings" 2017-02-07 01:01:51 +00:00
Jenkins
19db6458e7 Merge "Fix wrong min/max media queries for sidebar" 2017-02-06 23:45:43 +00:00
Jenkins
526ce2af1d Merge "Remove deprecated calls to novaclient.v2.contrib" 2017-02-06 20:21:17 +00:00
Jenkins
d1e89a9d46 Merge "Sync keystone policy to latest" 2017-02-06 20:19:51 +00:00
Eddie Ramirez
d659ff0f61 Small UI change in User Credentials Details modal
This patch adds/removes left or right helper classes. These conditions were
added in order to remove an empty white space to the right of the user
credentials ONLY if the user does not have EC2 Credentials.

Change-Id: Iac475220396460361aef9fba027d221f74b0b835
2017-02-06 18:20:59 +00:00
Jenkins
a311ac1a24 Merge "Fix the awkward English in description for extra info" 2017-02-06 10:57:04 +00:00
OpenStack Proposal Bot
8df643ec07 Imported Translations from Zanata
For more information about this automatic import see:
http://docs.openstack.org/developer/i18n/reviewing-translation-import.html

Change-Id: I84bbce615bfacb85a110f276a34d2cd73ee51406
2017-02-06 08:00:12 +00:00
Eric Brown
8f01b2cb0e Fix the awkward English in description for extra info
The description for the PROJECT_TABLE_EXTRA_INFO and
USER_TABLE_EXTRA_INFO settings makes no sense. This patch cleans
up the English to describe how to use these settings.

Change-Id: I6e14889a1dc8b3e4b242b6649847761084500c08
2017-02-05 17:22:01 -08:00
Eric Brown
7b93aa82ce Sync keystone policy to latest
The current version of the keystone policy file is out of sync
with the default shipped with keystone. This patch updates to
the latest.

Change-Id: I927d6bfb2b20440683fe756fff25605ec7d7160e
2017-02-05 17:05:57 -08:00
OpenStack Proposal Bot
95052ba73d Imported Translations from Zanata
For more information about this automatic import see:
http://docs.openstack.org/developer/i18n/reviewing-translation-import.html

Change-Id: I3c5dd2b62772bcb328f17ba83721dc0d76a8459b
2017-02-05 08:06:36 +00:00
OpenStack Proposal Bot
4a00c70bad Imported Translations from Zanata
For more information about this automatic import see:
http://docs.openstack.org/developer/i18n/reviewing-translation-import.html

Change-Id: I8504d152555bd93ef48cb989112b6fb15c7d91c9
2017-02-04 08:02:51 +00:00
Jenkins
cb2ccc22ff Merge "Nit: Fix the typo in ref/tables.rst" 2017-02-04 00:40:44 +00:00
Jenkins
4c425daaf8 Merge "Only get detailed info for Nova servers when necessary" 2017-02-04 00:39:18 +00:00