summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Sync oslo-incubator rpc moduleFlorent Flament2014-01-087-531/+17
* | | | | | | Merge "Synchronized with oslo db and db.sqlalchemy"Jenkins2014-01-127-142/+126
|\ \ \ \ \ \ \
| * | | | | | | Synchronized with oslo db and db.sqlalchemyIlya Pekelny2013-12-257-142/+126
* | | | | | | | Merge "Cleanup test_associate_project_endpoint_extension"Jenkins2014-01-121-3/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Cleanup test_associate_project_endpoint_extensionBrant Knudson2014-01-101-3/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge "Make common log import consistent"Jenkins2014-01-1244-93/+92
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Make common log import consistentMorgan Fainberg2014-01-1144-93/+92
* | | | | | | | Merge "Remove unnecessary line in test_auth"Jenkins2014-01-121-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove unnecessary line in test_authBrant Knudson2014-01-041-1/+0
* | | | | | | | Merge "Fix external auth (REMOTE_USER) plugin support"Jenkins2014-01-128-55/+254
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix external auth (REMOTE_USER) plugin supportAlvaro Lopez Garcia2014-01-108-55/+254
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge "Resolve oauth dependency after paste pipeline is loaded"Jenkins2014-01-124-9/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve oauth dependency after paste pipeline is loadedSteve Martinelli2014-01-084-9/+15
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge "Tests use cleanUp rather than tearDown"Jenkins2014-01-1112-112/+110
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Tests use cleanUp rather than tearDownBrant Knudson2014-01-0912-112/+110
* | | | | | | | Merge "Change ListOpt default value from str or None to list"Jenkins2014-01-112-9/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Change ListOpt default value from str or None to listWu Wenxiang2014-01-082-9/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Remove netifaces requirement"Jenkins2014-01-111-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove netifaces requirementBrant Knudson2014-01-091-2/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Remove unused test function"Jenkins2014-01-111-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused test functionBrant Knudson2014-01-041-3/+0
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge "races cause 404 when removing user from project"Jenkins2014-01-112-2/+31
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | races cause 404 when removing user from projectWu Wenxiang2014-01-072-2/+31
| |/ / / / / /
* | | | | | | Merge "Remove noop code"Jenkins2014-01-101-4/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove noop codeBrant Knudson2014-01-031-4/+0
* | | | | | | | Merge "Clean up fakeldap logging"Jenkins2014-01-101-30/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Clean up fakeldap loggingBrant Knudson2014-01-081-30/+25
* | | | | | | | | Merge "Cleanup from business logic refactor"Jenkins2014-01-103-8/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Cleanup from business logic refactorMorgan Fainberg2014-01-073-8/+10
* | | | | | | | | Merge "Introduce basic Pecan/WSME framework for KDS"Jenkins2014-01-0923-2/+747
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Introduce basic Pecan/WSME framework for KDSJamie Lennox2014-01-0723-2/+747
* | | | | | | | | | Merge "Fix typo in test"Jenkins2014-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix typo in testBrant Knudson2014-01-021-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Remove unused imports"Jenkins2014-01-091-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unused importsWu Wenxiang2014-01-031-1/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge "Remove unused code in contrib/ec2/controllers.py"Jenkins2014-01-091-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unused code in contrib/ec2/controllers.pyruichen2013-12-301-1/+0
* | | | | | | | | | | Merge "Remove 'disable user' logic from _delete_domain_contents"Jenkins2014-01-081-13/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Remove 'disable user' logic from _delete_domain_contentsMorgan Fainberg2014-01-031-13/+0
* | | | | | | | | | | Merge "Break dependency of base V3Controller on V2Controller"Jenkins2014-01-082-7/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Break dependency of base V3Controller on V2ControllerMorgan Fainberg2014-01-032-7/+7
* | | | | | | | | | | Merge "Move deletion business logic out of controllers"Jenkins2014-01-0812-299/+317
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Move deletion business logic out of controllersMorgan Fainberg2014-01-0312-299/+317
* | | | | | | | | | | Merge "Do not update password when updating grants in Assignment KVS"Jenkins2014-01-081-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Do not update password when updating grants in Assignment KVSMorgan Fainberg2014-01-031-0/+6
* | | | | | | | | | | Merge "Cleanup of new credential_api delete methods"Jenkins2014-01-082-17/+21
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Cleanup of new credential_api delete methodsMorgan Fainberg2014-01-032-17/+21
* | | | | | | | | | | Merge "Enhance list_group_users in GroupApi."Jenkins2014-01-082-1/+14
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Enhance list_group_users in GroupApi.Bo-Chun Lin2014-01-032-1/+14
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge "initialize eventlet for tests"Jenkins2014-01-081-1/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |