diff options
| author | Zuul <zuul@review.openstack.org> | 2018-03-24 22:28:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-03-24 22:28:03 +0000 |
| commit | 0289eba5583ab05eacb442b71cef9b6ca5b435b5 (patch) | |
| tree | a891dab08fee92cff3c2fe4a76aa12f0520e5e4a | |
| parent | a1be1f6058034d30277963a69ded2ea030b42cd6 (diff) | |
| parent | 41a1d15cb8d7705394f2f88e7bce37b418088f80 (diff) | |
Merge "Updated from global requirements"
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt index 31227ea..03d5076 100644 --- a/requirements.txt +++ b/requirements.txt | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # of appearance. Changing the order has an impact on the overall integration | 2 | # of appearance. Changing the order has an impact on the overall integration |
| 3 | # process, which may cause wedges in the gate later. | 3 | # process, which may cause wedges in the gate later. |
| 4 | 4 | ||
| 5 | neutron-lib>=1.12.0 # Apache-2.0 | 5 | neutron-lib>=1.13.0 # Apache-2.0 |
| 6 | oslo.i18n>=3.15.3 # Apache-2.0 | 6 | oslo.i18n>=3.15.3 # Apache-2.0 |
| 7 | oslo.log>=3.36.0 # Apache-2.0 | 7 | oslo.log>=3.36.0 # Apache-2.0 |
| 8 | oslo.utils>=3.33.0 # Apache-2.0 | 8 | oslo.utils>=3.33.0 # Apache-2.0 |
diff --git a/test-requirements.txt b/test-requirements.txt index 6540aea..7ceeb7d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt | |||
| @@ -6,7 +6,7 @@ hacking<0.11,>=0.10.0 | |||
| 6 | 6 | ||
| 7 | coverage!=4.4,>=4.0 # Apache-2.0 | 7 | coverage!=4.4,>=4.0 # Apache-2.0 |
| 8 | python-subunit>=1.0.0 # Apache-2.0/BSD | 8 | python-subunit>=1.0.0 # Apache-2.0/BSD |
| 9 | sphinx!=1.6.6,>=1.6.2 # BSD | 9 | sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD |
| 10 | oslosphinx>=4.7.0 # Apache-2.0 | 10 | oslosphinx>=4.7.0 # Apache-2.0 |
| 11 | oslotest>=3.2.0 # Apache-2.0 | 11 | oslotest>=3.2.0 # Apache-2.0 |
| 12 | os-testr>=1.0.0 # Apache-2.0 | 12 | os-testr>=1.0.0 # Apache-2.0 |