summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge "Create an admin context to refresh template files"7.0.0.0b2Jenkins2016-07-122-3/+5
|\
| * Create an admin context to refresh template filesSteve Baker2016-07-112-3/+5
* | Merge "Add stack files retrieval API"Jenkins2016-07-129-3/+86
|\ \
| * | Add stack files retrieval APISteven Hardy2016-07-119-3/+86
* | | Merge "Propage errors in post test hook"Jenkins2016-07-121-1/+1
|\ \ \
| * | | Propage errors in post test hookThomas Herve2016-07-111-1/+1
* | | | Merge "Do not show HIDDEN props in res type show"Jenkins2016-07-114-2/+57
|\ \ \ \
| * | | | Do not show HIDDEN props in res type showOleksii Chuprykov2016-07-064-2/+57
* | | | | Merge "HAProxy uses milliseconds for its timeout values."Jenkins2016-07-112-8/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | HAProxy uses milliseconds for its timeout values.Jesse Proudman2016-07-082-8/+8
* | | | | Merge "Remove unused LOG to keep code clean"Jenkins2016-07-112-7/+0
|\ \ \ \ \
| * | | | | Remove unused LOG to keep code cleanzhanghao2016-07-102-7/+0
| |/ / / /
* | | | | Merge "Improve validation for some functions"Jenkins2016-07-115-65/+19
|\ \ \ \ \
| * | | | | Improve validation for some functionsOleksii Chuprykov2016-07-085-65/+19
| |/ / / /
* | | | | Merge "Do not populate unused stack and watch rule objects"Jenkins2016-07-114-18/+8
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Do not populate unused stack and watch rule objectsSteve Baker2016-07-114-18/+8
* | | | | Updated from global requirementsOpenStack Proposal Bot2016-07-091-1/+1
|/ / / /
* | | | Updated from global requirementsOpenStack Proposal Bot2016-07-091-1/+1
|/ / /
* | | Merge "Improve validation during template.parse"Jenkins2016-07-087-87/+129
|\ \ \
| * | | Improve validation during template.parseOleksii Chuprykov2016-07-067-87/+129
* | | | Merge "sqlalchemy tests don't assume same session"Jenkins2016-07-081-65/+48
|\ \ \ \
| * | | | sqlalchemy tests don't assume same sessionSteve Baker2016-07-061-65/+48
* | | | | Merge "Add information about Resolve rule to docs"Jenkins2016-07-071-7/+11
|\ \ \ \ \
| * | | | | Add information about Resolve rule to docsPeter Razumovsky2016-06-291-7/+11
* | | | | | Merge "Allow admins to create public image by default"Jenkins2016-07-071-1/+3
|\ \ \ \ \ \
| * | | | | | Allow admins to create public image by defaulthuangtianhua2016-07-071-1/+3
| | |/ / / / | |/| | | |
* | | | | | Merge "Replace raw_input with input to make PY3 compatible"Jenkins2016-07-071-1/+2
|\ \ \ \ \ \
| * | | | | | Replace raw_input with input to make PY3 compatibleyuyafei2016-06-281-1/+2
* | | | | | | Fail the test run if image download failsThomas Herve2016-07-061-0/+6
* | | | | | | Merge "Convergence: Cancel message"Jenkins2016-07-064-10/+62
|\ \ \ \ \ \ \
| * | | | | | | Convergence: Cancel messageAnant Patil2016-07-054-10/+62
* | | | | | | | Merge "Change namespace 'ceilometer' to 'aodh'"Jenkins2016-07-0610-17/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Change namespace 'ceilometer' to 'aodh'huangtianhua2016-07-0410-17/+17
* | | | | | | | | Merge "Deprecate combination alarm"Jenkins2016-07-064-42/+50
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Deprecate combination alarmhuangtianhua2016-07-044-42/+50
* | | | | | | | Merge "Pass keystone session to clients"Jenkins2016-07-061-35/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Pass keystone session to clientsRabi Mishra2016-06-071-35/+6
* | | | | | | | Merge "Minor reorg of sqlalchemy encrypt test functions"Jenkins2016-07-051-44/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Minor reorg of sqlalchemy encrypt test functionsSteve Baker2016-06-221-44/+37
* | | | | | | | | Merge "Convergence: Fix concurrent update resource delete"Jenkins2016-07-0510-24/+123
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Convergence: Fix concurrent update resource deleteRakesh H S2016-07-0510-24/+123
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge "Add rolling update for SDG"Jenkins2016-07-053-4/+121
|\ \ \ \ \ \ \ \
| * | | | | | | | Add rolling update for SDGRabi Mishra2016-07-053-4/+121
| |/ / / / / / /
* | | | | | | | Merge "Use latest HOT version in Resource.build_template_dict"Jenkins2016-07-052-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Use latest HOT version in Resource.build_template_dictJason Dunsmore2016-06-292-8/+8
* | | | | | | | | Merge "Move _RESOURCE_KEYS down to class level"Jenkins2016-07-054-71/+74
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Move _RESOURCE_KEYS down to class levelJason Dunsmore2016-06-294-71/+74
* | | | | | | | | Merge "Add default release names for template versions"Jenkins2016-07-057-21/+73
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add default release names for template versionsJason Dunsmore2016-06-287-21/+73
* | | | | | | | | | Merge "Use openstack commands for prepare_test_network.sh"Jenkins2016-07-051-8/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |