From 4c2cc68d20c85a4d3f1bb83fb7633563e6a364cc Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Thu, 8 Dec 2011 15:14:48 -0800
Subject: [PATCH] Rename .nova-venv to .venv.

This simplifies a number of Jenkins jobs which currently, other
than directory names, could be the same for all OpenStack
projects. By renaming the virtualenv directory, the redundant
Jenkins virtualenv build and copy jobs can be eliminated.

Change-Id: Ieaf1dac3207ecb34b911c7edcd2086809abdf49e
---
 .gitignore | 1 +
 .mailmap   | 2 ++
 Authors    | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3ef41c87..64a96d0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ build/*
 build-stamp
 nova.egg-info
 .nova-venv
+.venv
 *.sqlite
 *.log
 po/*.pot
\ No newline at end of file
diff --git a/.mailmap b/.mailmap
index 2265c2e2..21bdaaa3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -25,6 +25,8 @@
 <jake@ansolabs.com> <jake@markupisart.com>
 <jake@ansolabs.com> <admin@jakedahn.com>
 <jaypipes@gmail.com> <jpipes@serialcoder>
+<jeblair@hp.com> <james.blair@rackspace.com>
+<jeblair@hp.com> <corvus@inaugust.com>
 <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>
diff --git a/Authors b/Authors
index 11e1daa8..adc7c9c9 100644
--- a/Authors
+++ b/Authors
@@ -55,7 +55,7 @@ Hisaki Ohara <hisaki.ohara@intel.com>
 Ilya Alekseyev <ilyaalekseyev@acm.org>
 Isaku Yamahata <yamahata@valinux.co.jp>
 Jake Dahn <jake@ansolabs.com>
-James E. Blair <james.blair@rackspace.com>
+James E. Blair <jeblair@hp.com>
 Jason Cannavale <jason.cannavale@rackspace.com>
 Jason Koelker <jason@koelker.net>
 Jay Pipes <jaypipes@gmail.com>