Bump python-novaclient version to 2.6.0.1.

Bump the python-novaclient version in pip-requires to 2.6.0.1. The
previous python-novaclient version 2.6.0 was broken and thus
Diablo tests were failing.

Also nails the Glance version in pip-requires to 2011.3.1. This
should fix 'No module named iso8601' errors when running
Diablo tests with the latest Diablo trunk builds.

Change-Id: Idc9bcceaff91afa69fbc255bc39a68d854ac1127

.mailmap

@@ -18,6 +18,7 @@
 <dan@nicira.com> <danwent@dan-xs3-cs>
 <dan@nicira.com> danwent@gmail.com
 <devin.carlen@gmail.com> <devcamcar@illian.local>
+<dprince@redhat.com> <dan.prince@rackspace.com>
 <ewan.mellor@citrix.com> <emellor@silver>
 <itoumsn@nttdata.co.jp> <itoumsn@shayol>
 <jake@ansolabs.com> <jake@markupisart.com>

Authors

@@ -27,7 +27,7 @@ Christian Berendt <berendt@b1-systems.de>
 Christopher MacGown <chris@pistoncloud.com>
 Chuck Short <zulcss@ubuntu.com>
 Cory Wright <corywright@gmail.com>
-Dan Prince <dan.prince@rackspace.com>
+Dan Prince <dprince@redhat.com>
 Dan Wendlandt <dan@nicira.com>
 Dave Walker <DaveWalker@ubuntu.com>
 David Pravec <David.Pravec@danix.org>

tools/pip-requires

@@ -11,7 +11,7 @@ eventlet
 kombu==1.0.4
 lockfile==0.8
 lxml==2.3
-python-novaclient==2.6.0
+python-novaclient==2.6.0.1
 python-daemon==1.5.5
 python-gflags==1.3
 redis==2.0.0
@@ -26,7 +26,7 @@ paste
 sqlalchemy-migrate
 netaddr
 sphinx
-glance
+glance==2011.3.1
 xattr>=0.6.0
 nova-adminclient
 suds==0.4