summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge "Needn't load fernet keys twice"8.0.0a0Jenkins2015-06-161-1/+1
|\
| * Needn't load fernet keys twiceDave Chen2015-06-151-1/+1
* | Merge "Refactor: move PKI-specific tests into the appropriate class"Jenkins2015-06-161-62/+52
|\ \
| * | Refactor: move PKI-specific tests into the appropriate classDolph Mathews2015-06-151-62/+52
| |/
* | Merge "Pass environment variables of proxy to tox"Jenkins2015-06-161-0/+1
|\ \
| * | Pass environment variables of proxy to toxYuiko Takada2015-06-151-0/+1
| |/
* | Merge "Mapping Engine CLI"Jenkins2015-06-152-0/+93
|\ \ | |/ |/|
| * Mapping Engine CLIMarek Denis2015-06-112-0/+93
* | Merge "Add validity check of 'expires_at' in trust creation"Jenkins2015-06-114-27/+31
|\ \
| * | Add validity check of 'expires_at' in trust creationliu-sheng2015-06-054-27/+31
* | | Imported Translations from TransifexOpenStack Proposal Bot2015-06-1120-1096/+989
* | | Merge "Avoid using the interactive interpreter for a one-liner"Jenkins2015-06-111-8/+5
|\ \ \
| * | | Avoid using the interactive interpreter for a one-linerDolph Mathews2015-06-051-8/+5
* | | | Merge "Fix spelling in configuration comment."Jenkins2015-06-111-2/+2
|\ \ \ \
| * | | | Fix spelling in configuration comment.Lance Bragstad2015-06-101-2/+2
* | | | | Merge "Remove identity_api from AuthInfo dependencies"Jenkins2015-06-101-5/+1
|\ \ \ \ \
| * | | | | Remove identity_api from AuthInfo dependenciesBrant Knudson2015-05-111-5/+1
* | | | | | Merge "Use lower default value for sha512_crypt rounds"Jenkins2015-06-101-1/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Use lower default value for sha512_crypt roundsIan Wienand2015-06-101-1/+7
* | | | | | Switch keystone over to oslo_log versionutilsDavanum Srinivas2015-06-1015-277/+16
* | | | | | Merge "Updated from global requirements"Jenkins2015-06-102-4/+4
|\ \ \ \ \ \
| * | | | | | Updated from global requirementsOpenStack Proposal Bot2015-06-092-4/+4
* | | | | | | Merge "Merge tag '2014.2'"Jenkins2015-06-100-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge tag '2014.2'Jeremy Stanley2015-06-090-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | updated translations2014.2.rc22014.2proposed/junoDolph Mathews2014-10-0714-2484/+43
| | * | | | | | Merge "Validates controller methods exist when specified" into proposed/junoJenkins2014-10-071-0/+8
| | |\ \ \ \ \ \
| | | * | | | | | Validates controller methods exist when specifiedDavid Stanek2014-10-061-0/+8
| | * | | | | | | Merge "Fixes an error deleting an endpoint group project" into proposed/junoJenkins2014-10-072-9/+23
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Fixes an error deleting an endpoint group projectDavid Stanek2014-10-062-9/+23
| | * | | | | | | Ensure sql upgrade tests can run with non-sqlite databases.Henry Nash2014-10-062-19/+65
| | |/ / / / / /
| | * | | | | | Fix tests comparing tokensBrant Knudson2014-10-021-10/+12
| | * | | | | | Merge "Convert unicode to UTF8 when calling ldap.str2dn()" into proposed/junoJenkins2014-10-023-4/+19
| | |\ \ \ \ \ \
| | | * | | | | | Convert unicode to UTF8 when calling ldap.str2dn()Nathan Kinder2014-10-013-4/+19
| | * | | | | | | Merge "Fix parsing of emulated enabled DN" into proposed/junoJenkins2014-10-022-3/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix parsing of emulated enabled DNNathan Kinder2014-09-302-3/+12
| | | |/ / / / / /
| | * | | | | | | Handle default string values when using user_enabled_invertNathan Kinder2014-09-302-0/+32
| | |/ / / / / /
* | | | | | | | Merge "Merge tag '2015.1.0'"Jenkins2015-06-100-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge tag '2015.1.0'Jeremy Stanley2015-06-090-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge "Release Import of Translations from Transifex" into stable/kilo2015.1.0rc22015.1.0Jenkins2015-04-2313-5161/+35
| | |\ \ \ \ \ \ \
| | | * | | | | | | Release Import of Translations from TransifexAndreas Jaeger2015-04-2013-5161/+35
| | * | | | | | | | Sync oslo-incubator Ie51669bd278288b768311ddf56ad31a2f28cc7abBrant Knudson2015-04-221-10/+29
| | * | | | | | | | Merge "Updated from global requirements" into stable/kiloJenkins2015-04-214-7/+7
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Updated from global requirementsOpenStack Proposal Bot2015-04-204-7/+7
| | | |/ / / / / / /
| | * | | | | | | | Merge "WebSSO should use remote_id_attribute by protocol" into stable/kiloJenkins2015-04-203-6/+25
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | WebSSO should use remote_id_attribute by protocollin-hua-cheng2015-04-153-6/+25
| | * | | | | | | | | Merge "Make memcache client reusable across threads" into stable/kiloJenkins2015-04-202-5/+32
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Make memcache client reusable across threadsAlexander Makarov2015-04-202-5/+32
| | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge "Update man pages for the Kilo release" into stable/kiloJenkins2015-04-201-2/+5
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Update man pages for the Kilo releaseLance Bragstad2015-04-151-2/+5
| | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge "backend_argument should be marked secret" into stable/kiloJenkins2015-04-201-1/+1
| | |\ \ \ \ \ \ \ \ \