summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge "Change alarm_history.detail to text type" into milestone-proposed2013.2.rc22013.2Jenkins2013-10-122-1/+39
|\
| * Change alarm_history.detail to text typeStephen Gran2013-10-122-1/+39
* | Avoid leaking admin-ness into combination alarmsMehdi Abaakouk2013-10-122-18/+127
|/
* Merge "Change resource.resource_metadata to text type" into milestone-proposedJenkins2013-10-122-1/+39
|\
| * Change resource.resource_metadata to text typeHaomeng, Wang2013-10-112-1/+39
* | Merge "Avoid leaking admin-ness into threshold-oriented alarms" into mileston...Jenkins2013-10-123-57/+144
|\ \
| * | Avoid leaking admin-ness into threshold-oriented alarmsEoghan Glynn2013-10-113-57/+144
| |/
* | Add support for keystoneclient 0.4.0Julien Danjou2013-10-112-11/+19
|/
* Merge "Ensure combination alarms can be evaluated" into milestone-proposedJenkins2013-10-102-10/+10
|\
| * Ensure combination alarms can be evaluatedEoghan Glynn2013-10-102-10/+10
* | Merge "Ensure combination alarm evaluator can be loaded" into milestone-proposedJenkins2013-10-101-0/+1
|\ \
| * | Ensure combination alarm evaluator can be loadedEoghan Glynn2013-10-101-0/+1
| |/
* | Merge "Return 401 when action is not authorized" into milestone-proposedJenkins2013-10-102-14/+11
|\ \
| * | Return 401 when action is not authorizedMehdi Abaakouk2013-10-032-14/+11
| |/
* | db2 does not allow None as a key for user_id in user collectionTong Li2013-10-031-2/+2
|/
* Merge "Imported Translations from Transifex"2013.2.rc1OpenStack Jenkins2013-10-0248-1009/+1009
|\
| * Imported Translations from TransifexOpenStack Jenkins2013-10-0248-1009/+1009
* | Merge "Disable lazy translation"Jenkins2013-10-021-2/+1
|\ \ | |/ |/|
| * Disable lazy translationBen Nemec2013-10-011-2/+1
* | Merge "api: remove useless comments"Jenkins2013-10-011-14/+0
|\ \
| * | api: remove useless commentsJulien Danjou2013-09-301-14/+0
* | | Merge "Updated from global requirements"OpenStack Jenkins2013-10-011-3/+3
|\ \ \
| * | | Updated from global requirementsOpenStack Jenkins2013-10-011-3/+3
* | | | Merge "update alarm service setup in dev doc"Jenkins2013-10-011-1/+1
|\ \ \ \
| * | | | update alarm service setup in dev docGordon Chung2013-09-301-1/+1
* | | | | Merge "api: allow alarm creation for others project by admins"Jenkins2013-10-013-7/+215
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | api: allow alarm creation for others project by adminsJulien Danjou2013-10-013-7/+215
* | | | | Merge "keystone client changes in AuthProtocol made our test cases failing"Jenkins2013-10-012-4/+8
|\ \ \ \ \
| * | | | | keystone client changes in AuthProtocol made our test cases failingTong Li2013-09-262-4/+8
* | | | | | Merge "tests: fix rounding issue in timestamp comparison"Jenkins2013-10-013-10/+19
|\ \ \ \ \ \
| * | | | | | tests: fix rounding issue in timestamp comparisonJulien Danjou2013-09-303-10/+19
* | | | | | | Merge "issue an error log when cannot import libvirt"Jenkins2013-10-012-1/+24
|\ \ \ \ \ \ \
| * | | | | | | issue an error log when cannot import libvirtfujioka yuuichi2013-09-302-1/+24
* | | | | | | | Merge "Add bug number of some wsme issue"Jenkins2013-10-011-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add bug number of some wsme issueMehdi Abaakouk2013-09-301-3/+3
* | | | | | | | | Merge "assertEquals is deprecated, use assertEqual"Jenkins2013-10-0110-54/+54
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | assertEquals is deprecated, use assertEqualDirk Mueller2013-10-0110-54/+54
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-10-0148-1797/+10593
|/ / / / / / /
* | | | | | | Merge "api: return 404 if a alarm is not found"Jenkins2013-10-013-31/+35
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | api: return 404 if a alarm is not foundMehdi Abaakouk2013-09-303-31/+35
* | | | | | | Merge "api: return 404 if a resource is not found"Jenkins2013-09-305-22/+27
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | api: return 404 if a resource is not foundJulien Danjou2013-09-275-22/+27
* | | | | | Merge "remove locals() for stringformat"Jenkins2013-09-301-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | remove locals() for stringformatfujioka yuuichi2013-09-301-2/+2
| | |/ / / | |/| | |
* | | | | add coverage config file to control module coverage reportTong Li2013-09-301-0/+5
* | | | | Merge "add more test cases to improve the test code coverage #3"Jenkins2013-09-301-0/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | add more test cases to improve the test code coverage #3Tong Li2013-09-271-0/+8
| |/ / /
* | | | Merge "Don't load into alarms evaluators disabled alarms"Jenkins2013-09-303-23/+5
|\ \ \ \
| * | | | Don't load into alarms evaluators disabled alarmsMehdi Abaakouk2013-09-263-23/+5
* | | | | Merge "Allow to get a disabled alarm"Jenkins2013-09-309-16/+61
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |