trunk merge, pip-requires and novatools to novaclient changes
This commit is contained in:
commit
85728e3cbb
1
.mailmap
1
.mailmap
@ -19,6 +19,7 @@
|
||||
<jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local>
|
||||
<jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>
|
||||
<jmckenty@gmail.com> <joshua.mckenty@nasa.gov>
|
||||
<josh@jk0.org> <josh.kearney@rackspace.com>
|
||||
<justin@fathomdb.com> <justinsb@justinsb-desktop>
|
||||
<justin@fathomdb.com> <superstack@superstack.org>
|
||||
<masumotok@nttdata.co.jp> Masumoto<masumotok@nttdata.co.jp>
|
||||
|
2
Authors
2
Authors
@ -31,7 +31,7 @@ John Dewey <john@dewey.ws>
|
||||
Jonathan Bryce <jbryce@jbryce.com>
|
||||
Jordan Rinke <jordan@openstack.org>
|
||||
Josh Durgin <joshd@hq.newdream.net>
|
||||
Josh Kearney <josh.kearney@rackspace.com>
|
||||
Josh Kearney <josh@jk0.org>
|
||||
Joshua McKenty <jmckenty@gmail.com>
|
||||
Justin Santa Barbara <justin@fathomdb.com>
|
||||
Kei Masumoto <masumotok@nttdata.co.jp>
|
||||
|
@ -10,7 +10,7 @@ boto==1.9b
|
||||
carrot==0.10.5
|
||||
eventlet==0.9.12
|
||||
lockfile==0.8
|
||||
python-novatools==2.0
|
||||
python-novaclient==2.3
|
||||
python-daemon==1.5.5
|
||||
python-gflags==1.3
|
||||
redis==2.0.0
|
||||
|
Loading…
x
Reference in New Issue
Block a user