summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix unused imports(flake8 F401, F999)"0.2.5Jenkins2013-06-0314-31/+18
|\
| * Fix unused imports(flake8 F401, F999)Dolph Mathews2013-06-0314-31/+18
| | | | | | | | | | | | | | | | | | | | - F401: imported but unused - F999: syntax error in doctest Fixing a couple of the F401's simply required fixing the doctests syntax where the imports were actually in use. Change-Id: If78abbb143daf8d005a71c5ab52836df29c5e0cd
* | Merge "Fix --version to output version"Jenkins2013-06-031-18/+2
|\ \
| * | Fix --version to output versionAndy McCrae2013-06-031-18/+2
| | | | | | | | | | | | | | | Change-Id: I7d8dc83ac7c2ad7519633d136c1c32ce8537dce8 Fixes: bug 1182675
* | | Merge "Fix line continuations (flake8 E125, E126)"Jenkins2013-06-037-31/+25
|\ \ \ | |/ / |/| / | |/
| * Fix line continuations (flake8 E125, E126)Dolph Mathews2013-06-037-31/+25
| | | | | | | | | | | | | | | | - E125: continuation line does not distinguish itself from next logical line - E126: continuation line over-indented for hanging indent Change-Id: I626a6d5d57db927e8b239f90569b5601c772f28b
* | Merge "Enumerate ignored flake8 rules"Jenkins2013-05-311-1/+18
|\ \ | |/
| * Enumerate ignored flake8 rulesDolph Mathews2013-05-281-1/+18
| | | | | | | | | | | | | | | | We were previously ignoring all F* and H* rules; this patch specifically identifies them so that we can eliminate them one by one, without introducing regressions along the way. Change-Id: Iaf9ee17acf44aba1c93c1af50c84bd8216544b89
* | Merge "Make ManagerWithFind abstract and fix TokenManager"Jenkins2013-05-312-1/+9
|\ \
| * | Make ManagerWithFind abstract and fix TokenManagerAlessio Ababilov2013-05-192-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | ManagerWithFind requires list() method in its descendants. Make it abstract and fix its improper descendant TokenManager that do not implement list(). Change-Id: I83ae47d894c02d5cd1eb0da437dd05796d0b0160 Fixes: bug #1180393
* | | Merge "Missing command descriptions for 'token-get' and 'endpoint-get'"Jenkins2013-05-301-0/+3
|\ \ \
| * | | Missing command descriptions for 'token-get' and 'endpoint-get'xingzhou2013-05-271-0/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using command "keystone help token-get" and "keystone help endpoint-get", the description of these commands are missing. The main reason is that keystoneclient is using the command action method's method doc as the command description. In keystoneclient/v2_0/shell.py, the two commands' action method are 'do_endpoint_get' and 'do_token_get'. These two methods have a decorator of "require_service_catalog" which is a function wrapper, and this decorator has changed the origin __doc__ of the wrapped function by default Modify "require_service_catalog" to change the __doc__ back to the origin function's __doc__ Change-Id: I9977a3d279529b2066667cd2ffe44dd953b4d2fb Fixes: Bug 1182107
* | | Merge "Check Expiry"0.2.4Jenkins2013-05-2823-136/+199
|\ \ \
| * | | Check ExpiryAdam Young2013-05-2823-136/+199
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly checks the expiry on the tokens, and rejects tokens that have expired had to regenerate the sample data for the tokens as they all had been generated with values that are now expired. bug 1179615 Change-Id: Ie06500d446f55fd0ad67ea540c92d8cfc57483f4
* | | Merge " Rename requires files to standard names."Jenkins2013-05-284-4/+4
|\ \ \ | |/ / |/| |
| * | Rename requires files to standard names.Carlos D. Garza2013-05-244-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rename tools/pip-requires to requirements.txt and tools/test-requires to test-requirements.txt. These are standard files, and tools in the general world are growing intelligence about them. Change-Id: If5c7080fea7c5ca5935b3c064e368cb837a9c16b Fixes: bug #1179008
* | | Merge "Suggestion of a new arguments display in the help, to reflect ↵Jenkins2013-05-251-1/+2
|\ \ \ | |/ / |/| | | | | required ones Fix bug 1182130"
| * | Suggestion of a new arguments display in the help, to reflect required onesChristophe Sauthier2013-05-251-1/+2
| | | | | | | | | | | | | | | | | | Fix bug 1182130 Change-Id: I9823d057aff11e7d90c8098ea31cdbf4d709c39f
* | | Merge "Default signing_dir to secure temp dir (bug 1181157)"Jenkins2013-05-221-3/+5
|\ \ \
| * | | Default signing_dir to secure temp dir (bug 1181157)Dolph Mathews2013-05-221-3/+5
| | | | | | | | | | | | | | | | Change-Id: I1a29f50b07a60de3d0519bf40074dbea92fa8656
* | | | Merge "Only add logging handlers if there currently aren't any"Jenkins2013-05-221-1/+1
|\ \ \ \
| * | | | Only add logging handlers if there currently aren't anyNicolas Simonds2013-05-211-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This corrects an odd problem where Horizon would stand up multiple client objects, which would cause duplicate/triplicate/dozens of repeated log lines in its log files, due to multiple identical handlers being added to the logging object Fixes Bug 1182678 Change-Id: I020b3999c9008b996286ccb74a7801c96c43e71c
* | | | Merge "Migrate to flake8."Jenkins2013-05-224-9/+17
|\ \ \ \
| * | | | Migrate to flake8.Monty Taylor2013-05-174-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1172444. Change-Id: Icd51f5d925d84dcec7df7c83ca43cd87bc1b090f
* | | | | Merge "Migrate to pbr."Jenkins2013-05-228-413/+54
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Migrate to pbr.Monty Taylor2013-05-178-413/+54
| | |/ | |/| | | | | | | | | | | | | Fixes bug 1179007 Change-Id: Iceb63c223faab49be01baa36c035f703ddf59fc0
* | | Pass memcache_servers as arrayDirk Mueller2013-05-211-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the python-memcached module expects memcache_servers to be an array of strings or an array of tuples. Since we don't care about server weighting, we can use an array of tuples for the unit test. Fixes bug 1172723 Change-Id: Iafba2bda545ea334d5aba7135e153d8589612ba4
* | | Merge "Allow secure user password update."Jenkins2013-05-212-3/+30
|\ \ \
| * | | Allow secure user password update.Pradeep Kilambi2013-05-202-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows the ability for user password to be updated via a command prompt so the password doesnt show up in the bash history. The prompted password is asked twice to verify the match. If user cntl-D's the prompt a message appears suggesting user to use either of the options to update the password. Fixes: bug#938315 Change-Id: I4271ae569b922f33c34f9b015a7ee6f760414e39
* | | | Merge "Refactor v3 API to support filtering"Jenkins2013-05-205-13/+50
|\ \ \ \ | |_|/ / |/| | |
| * | | Refactor v3 API to support filteringJ. Matt Peterson2013-05-065-13/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: bug #1175356 Future implementations of keystone API v3 will support server-side filtering using key/value attributes. See additional details: https://github.com/openstack/identity-api/blob/master/openstack-identity-api/src/markdown/identity-api-v3.md#list-entities-filtered-by-attribute To support this functionality **kwargs need to be passed from the v3 API classes to keystoneclient.base.CrudManager.list. This is not fully implemented server-side for all attributes so it's difficult to document exactly which attributes will work. An example of a working attribute is: keystone.users.list(name="someone") Change-Id: I148093fbe37700f890ed44148aa3f63f34ee5ff5
* | | | Merge "Use testr instead of nose."Jenkins2013-05-1710-219/+267
|\ \ \ \
| * | | | Use testr instead of nose.Monty Taylor2013-05-1010-219/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of blueprint grizzly-testtools Change-Id: I76dee19781eaac21901b5c0258e83a42180c1702
* | | | | Merge "Perform oslo-incubator code sync."Jenkins2013-05-177-217/+233
|\ \ \ \ \ | |/ / / /
| * | | | Perform oslo-incubator code sync.Clark Boylan2013-05-107-217/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | run_tests.sh cannot install a virtualenv with tools/install_venv.py as tools/install_venv_common.py depends on oslo.config which is an external dependency. The virtualenv installer should not depend on any external dependencies. Fix this by performing a code sync with oslo-incubator. Note this adds a new dependency on six and changes the way versioning is determined. Change-Id: Ifb67bbfeec4eabc943c2a88a34fe535c57f174a1
* | | | | Merge "Added Conflict Exception to the exception code map"Jenkins2013-05-172-0/+37
|\ \ \ \ \
| * | | | | Added Conflict Exception to the exception code mapKannan Manickam2013-05-072-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Conflict Exception is added for HTTP error code 409. However this exception is never raised as this class is not added to the error_code map and always raises the ClientException whenever a 409 code is returned. Fixes bug #1168826 Change-Id: I7045eae33533ff603f4aab61ea988264b46f0d09
* | | | | | Merge "Restore compatibility with PrettyTable < 0.7.2"Jenkins2013-05-171-2/+4
|\ \ \ \ \ \
| * | | | | | Restore compatibility with PrettyTable < 0.7.2Dirk Mueller2013-04-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PrettyTable 0.7.2 defaults to print a table even if the resultset is empty. Restore previous behavior to be in line with older prettytable releases. Change-Id: Idd1d0c2c2f41966076517cbc8819ba9a5e097306
* | | | | | | change "int(marker)" to "marker" on user list pagination.Zhenguo Niu2013-05-142-5/+5
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7763b2cb3a1991402cb5e909a3cbf9d49f8e9bd1 Fixes: bug 1178152
* | | | | | Merge "Remove duplicate test definitions"Jenkins2013-05-092-9/+0
|\ \ \ \ \ \
| * | | | | | Remove duplicate test definitionsDirk Mueller2013-04-222-9/+0
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few functions were duplicate, apparently merge errors. Remove them. Change-Id: Ifa23eb1fe5a5782101491be6b90ee9bed1e41b1b
* | | | | | Securely create signing_dir (bug 1174608)Dolph Mathews2013-05-081-9/+14
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Also verifies the security of an existing signing_dir. Change-Id: I0685b4274a94ad3974a2b2a7ab3f45830d3934bb
* | | | | Merge "adding notes about dealing with exceptions in the client"Jenkins2013-05-062-0/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | adding notes about dealing with exceptions in the clientJoe Heck2013-04-032-0/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: I661b10414e0281bc695236bb32f985b0ef5b7600
* | | | | Revert "Use TokenManager to get token"Dolph Mathews2013-04-304-20/+48
| |_|/ / |/| | | | | | | This reverts commit 22228f526d6ea08b7006be1287afe959b93c23db which appears to be breaking the keystone gating
* | | | Use TokenManager to get tokenJulien Danjou2013-04-194-48/+20
| |/ / |/| | | | | | | | | | | | | | | | | | | | Instead of implementing token retrieval twice, let's use the code provided by the TokenManger to get a token in raw format from Keystone. Change-Id: I769be118ee137580cabd5cabcf7843e7afe1e456 Signed-off-by: Julien Danjou <julien@danjou.info>
* | | Merge "Pass json object when invoking exception handler."Jenkins2013-04-182-11/+36
|\ \ \
| * | | Pass json object when invoking exception handler.Lin Hua Cheng2013-04-172-11/+36
| | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1154753. Change-Id: I6ca7c758d42e8586c8adf2529ce5362108a57a56
* | | | Merge "Convert requests.ConnectionError to ClientException"Jenkins2013-04-181-5/+10
|\ \ \ \ | |/ / / |/| | |
View Lorry Controller Status