summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap4
-rw-r--r--requirements.txt4
-rw-r--r--test-requirements.txt2
3 files changed, 6 insertions, 4 deletions
diff --git a/.mailmap b/.mailmap
index a140129..d27c00f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,5 @@
-<douglas.mendizabal@rackspace.com> <dougmendizabal@gmail.com>
+Douglas Mendizábal <douglas@redrobot.io> <douglas.mendizabal@rackspace.com>
+Douglas Mendizábal <douglas@redrobot.io> <dougmendizabal@gmail.com>
+Douglas Mendizábal <douglas@redrobot.io> <mail@doug.gt>
<jarret.raim@rackspace.com> <jarito@gmail.com>
John Wood <john.wood@rackspace.com> jfwood
diff --git a/requirements.txt b/requirements.txt
index 39eec21..fbbf7aa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,9 +2,9 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr>=1.6 # Apache-2.0
-requests!=2.9.0,>=2.8.1 # Apache-2.0
+requests>=2.10.0 # Apache-2.0
six>=1.9.0 # MIT
-python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
+python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0
cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
oslo.i18n>=2.1.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index c9bdfc0..5e612fb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,7 @@
coverage>=3.6 # Apache-2.0
discover # BSD
hacking<0.11,>=0.10.0
-fixtures>=1.3.1 # Apache-2.0/BSD
+fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
requests-mock>=0.7.0 # Apache-2.0
mock>=1.2 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD