diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-22 14:37:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-22 14:37:59 +0000 |
| commit | 02c2bc69e5061edda7aa324ec515930a7d1d0b8d (patch) | |
| tree | 17da0f5e4cff40ffadbce9af590aff0ea3e9cba5 | |
| parent | 1fc5037cdfae209825c9122cb0851ff70538e698 (diff) | |
| parent | 881aaa44d7b573fd09efa39bd027534f6b24dd00 (diff) | |
| download | ceilometermiddleware-02c2bc69e5061edda7aa324ec515930a7d1d0b8d.tar.gz | |
Merge "Updated from global requirements"
| -rw-r--r-- | requirements.txt | 8 | ||||
| -rw-r--r-- | test-requirements.txt | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/requirements.txt b/requirements.txt index 24ef967..3748de2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,10 +2,10 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -oslo.config>=1.6.0 -oslo.context>=0.1.0 -oslo.messaging>=1.6.0 # Apache-2.0 -oslo.utils>=1.2.0 +oslo.config>=1.9.3,<1.10.0 # Apache-2.0 +oslo.context>=0.2.0,<0.3.0 # Apache-2.0 +oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0 +oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 pbr>=0.6,!=0.7,<1.0 pycadf>=0.8.0 six>=1.9.0 diff --git a/test-requirements.txt b/test-requirements.txt index 6f3e778..d48579c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,8 +8,8 @@ coverage>=3.6 discover python-subunit>=0.0.18 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.2.0 -oslotest>=1.2.0 +oslosphinx>=2.5.0,<2.6.0 # Apache-2.0 +oslotest>=1.5.1,<1.6.0 # Apache-2.0 testrepository>=0.0.18 testscenarios>=0.4 testtools>=0.9.36,!=1.2.0 |