Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge "Accommodate v2 and v3 auth for integration tests" into stable/liberty | Jenkins | 2016-04-04 | 6 | -45/+102 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Accommodate v2 and v3 auth for integration tests | Rabi Mishra | 2016-03-30 | 6 | -45/+102 | |
* | | | | | | | | | Merge "Heat integration tests failing against https endpoints" into stable/li... | Jenkins | 2016-04-04 | 7 | -16/+28 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Heat integration tests failing against https endpoints | Ishant Tyagi | 2016-03-29 | 7 | -16/+28 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge "Fix DB unit tests in the western hemisphere" into stable/liberty | Jenkins | 2016-03-31 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix DB unit tests in the western hemisphere | Zane Bitter | 2016-02-26 | 1 | -2/+2 | |
* | | | | | | | | Merge "Attempt to delete internal resources if create server fail" into stabl... | Jenkins | 2016-03-22 | 2 | -5/+49 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | Attempt to delete internal resources if create server fail | huangtianhua | 2016-01-21 | 2 | -5/+49 | |
* | | | | | | | | Merge "Updated from global requirements" into stable/liberty | Jenkins | 2016-03-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Updated from global requirements | OpenStack Proposal Bot | 2016-03-09 | 1 | -1/+1 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge "Make auth_url lookup dynamic" into stable/liberty | Jenkins | 2016-03-14 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Make auth_url lookup dynamic | Johannes Grassler | 2016-03-08 | 1 | -1/+7 | |
* | | | | | | | | Merge "Build list of enabled os-collect-config collectors" into stable/liberty | Jenkins | 2016-03-09 | 2 | -12/+42 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Build list of enabled os-collect-config collectors | Steve Baker | 2016-03-07 | 2 | -12/+42 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge "Eliminate bogus deprecation warning" into stable/liberty | Jenkins | 2016-03-08 | 1 | -5/+2 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Eliminate bogus deprecation warning | Zane Bitter | 2016-03-01 | 1 | -5/+2 | |
* | | | | | | | | Merge "remove containers on delete" into stable/liberty | Jenkins | 2016-03-07 | 3 | -30/+56 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | remove containers on delete | Lars Kellogg-Stedman | 2016-03-02 | 3 | -30/+56 | |
* | | | | | | | | Merge "Fix test_encryption_vol_type to take admin creds from conf" into stabl... | Jenkins | 2016-03-03 | 4 | -6/+23 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix test_encryption_vol_type to take admin creds from conf | Rakesh H S | 2016-03-02 | 4 | -6/+23 | |
* | | | | | | | | | Merge "Raise ResourceTypeNotFound in get_resource_info()" into stable/liberty | Jenkins | 2016-03-03 | 6 | -33/+55 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Raise ResourceTypeNotFound in get_resource_info() | Rakesh H S | 2016-03-01 | 6 | -33/+55 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge "Fix property TTL in Designate::Domain" into stable/liberty | Jenkins | 2016-03-03 | 2 | -9/+16 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix property TTL in Designate::Domain | Peter Razumovsky | 2016-02-23 | 2 | -9/+16 | |
* | | | | | | | | | | Merge "Ignore TypeErrors on old properties during update" into stable/liberty | Jenkins | 2016-03-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Ignore TypeErrors on old properties during update | Zane Bitter | 2016-03-01 | 1 | -1/+1 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge "Do not pass both port-id and fixed-ip to create server" into stable/li... | Jenkins | 2016-03-02 | 3 | -7/+80 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Do not pass both port-id and fixed-ip to create server | huangtianhua | 2016-02-18 | 3 | -7/+80 | |
* | | | | | | | | | Merge "Allow str_replace to reference parameters/attributes" into stable/liberty | Jenkins | 2016-03-02 | 4 | -4/+68 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Allow str_replace to reference parameters/attributes | Steven Hardy | 2016-02-29 | 4 | -4/+68 | |
* | | | | | | | | | Merge "Ignore ValueError when adding dependencies" into stable/liberty | Jenkins | 2016-02-29 | 2 | -1/+20 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Ignore ValueError when adding dependencies | Rabi Mishra | 2016-01-26 | 2 | -1/+20 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge "Don't allow specify fixed_ip and port at the same time" into stable/li... | Jenkins | 2016-02-29 | 2 | -2/+13 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | Don't allow specify fixed_ip and port at the same time | huangtianhua | 2016-02-18 | 2 | -2/+13 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge "Ignore errors on old properties during update" into stable/liberty | Jenkins | 2016-02-29 | 2 | -3/+104 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Ignore errors on old properties during update | Thomas Herve | 2016-02-10 | 2 | -3/+104 | |
| |/ / / / / | ||||||
* | | | | | | Merge "Fix database purge query" into stable/liberty | Jenkins | 2016-02-25 | 3 | -42/+114 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Fix database purge query | Thomas Herve | 2016-02-11 | 3 | -42/+114 | |
| |/ / / / | ||||||
* | | | | | Use oslo.config fixture to avoid gate break | Davanum Srinivas | 2016-02-23 | 4 | -31/+12 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge "Populate context roles when using stored context" into stable/liberty | Jenkins | 2016-02-19 | 4 | -2/+34 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Populate context roles when using stored context | Steven Hardy | 2016-02-05 | 4 | -2/+34 | |
| |/ / | ||||||
* | | | Merge "Prevent phantom user hooks" into stable/liberty | Jenkins | 2016-02-10 | 1 | -8/+12 | |
|\ \ \ | ||||||
| * | | | Prevent phantom user hooks | Zane Bitter | 2016-01-28 | 1 | -8/+12 | |
| |/ / | ||||||
* | | | Merge "Don't calculate attributes for metadata request" into stable/liberty | Jenkins | 2016-02-10 | 6 | -8/+20 | |
|\ \ \ | ||||||
| * | | | Don't calculate attributes for metadata request | Zane Bitter | 2016-01-25 | 6 | -8/+20 | |
| |/ / | ||||||
* | | | Merge "Don't recompute metadata after clearing a user hook" into stable/liberty | Jenkins | 2016-02-09 | 5 | -11/+15 | |
|\ \ \ | ||||||
| * | | | Don't recompute metadata after clearing a user hook | Zane Bitter | 2016-02-05 | 5 | -11/+15 | |
| |/ / | ||||||
* | | | Translate all properties during update | Thomas Herve | 2016-02-04 | 1 | -0/+1 | |
|/ / | ||||||
* | | Merge "Use negative timeout for convergence unittests" into stable/liberty5.0.1 | Jenkins | 2016-01-19 | 1 | -3/+3 | |
|\ \ | ||||||
| * | | Use negative timeout for convergence unittests | Sergey Kraynev | 2016-01-15 | 1 | -3/+3 |