diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-01-13 11:31:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-01-13 11:31:55 +0000 |
| commit | bc9327f9f112f96c7520fd49345bab53a2d858c0 (patch) | |
| tree | f632c2885ab477bc8a4d8d7b14cbef41bb721bed | |
| parent | 02f0910972f78cfa86b3b5d159ee00ca905514f4 (diff) | |
| parent | 3dfefe69192b25906c7b05809811a19014716a7a (diff) | |
| download | oslo-concurrency-bc9327f9f112f96c7520fd49345bab53a2d858c0.tar.gz | |
Merge "Bump to hacking 0.10"0.4.0
| -rw-r--r-- | oslo_concurrency/opts.py | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 | ||||
| -rw-r--r-- | tests/__init__.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/oslo_concurrency/opts.py b/oslo_concurrency/opts.py index a6f1e45..8189ab4 100644 --- a/oslo_concurrency/opts.py +++ b/oslo_concurrency/opts.py @@ -42,4 +42,4 @@ def list_opts(): :returns: a list of (group_name, opts) tuples """ - return [('oslo_concurrency', copy.deepcopy(lockutils._opts))]
\ No newline at end of file + return [('oslo_concurrency', copy.deepcopy(lockutils._opts))] diff --git a/test-requirements.txt b/test-requirements.txt index 06a765a..32cdaae 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.9.1,<0.10 +hacking>=0.10.0,<0.11 oslotest>=1.2.0 # Apache-2.0 coverage>=3.6 futures>=2.1.6 diff --git a/tests/__init__.py b/tests/__init__.py index b4d424e..bd455c4 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -16,4 +16,4 @@ import os if os.environ.get('TEST_EVENTLET'): import eventlet - eventlet.monkey_patch()
\ No newline at end of file + eventlet.monkey_patch() |