summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@hp.com>2012-04-17 12:12:30 -0700
committerMonty Taylor <mordred@inaugust.com>2012-04-18 07:39:27 -0700
commit0c18385fd16ae3a30b106238e0cdedd12f576b80 (patch)
tree926fb8f814b59641fbb8ac53166aadd2d53efbe5 /.mailmap
parente36dbd2c2a7f50033860dfa00f2c3b3ff29934e3 (diff)
downloadhorizon-0c18385fd16ae3a30b106238e0cdedd12f576b80.tar.gz
Add distribute to test-requires.
Currently glance (which is required for testing by keystone because there is no python-glanceclient yet) requires distribute>=0.6.24, but it can't be installed as a dependency of a dependency. Requiring it explicitly here should help. Install test-requires first, otherwise distribute doesn't get properly set. Install distribute manually until we can re-address venv creation. Align webob version to the other projects due to version conflicts. Change-Id: Iac0b6860c600fbf230cf4f602ce1b76c68fcb7cd
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 1 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index d98b4638b..595bcba03 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,5 +5,4 @@
<jake@ansolabs.com> <admin@jakedahn.com>
<launchpad@markgius.com> <mgius7096@gmail.com>
<yorik.sar@gmail.com> <yorik@ytaraday>
-
-
+<jeblair@hp.com> <james.blair@rackspace.com>