summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2012-11-26 13:06:10 -0600
committerJosh Kearney <josh@jk0.org>2012-11-26 14:29:37 -0600
commiteae906f8a84023ff0f0f3af1196d2af112765501 (patch)
tree1ff0d760974126dbe87ed2bbb166e593a891d15f /.mailmap
parenta6d8554fa3a0ab024c3d52696e02fd3db6e21006 (diff)
downloadnova-eae906f8a84023ff0f0f3af1196d2af112765501.tar.gz
Add SSL support to utils.generate_glance_url().
Since glance now supports SSL, we need to take this into consideration when generating the URL. Also updates and adds a test. A new config option 'glance_protocol' was added that defaults to 'http' since that's what the glance options, '*_client_protocol', default to. Set to 'https' for SSL. Change-Id: Id231a1fd4c4d8e221ae0cf6541181e5572dff02b
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index ac6f75f88f..f97171d8d2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -37,7 +37,8 @@
<jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>
<jmckenty@gmail.com> <joshua.mckenty@nasa.gov>
<johannes.erdfelt@rackspace.com> <johannes@compute3.221.st>
-<josh@jk0.org> <josh.kearney@rackspace.com>
+<josh.kearney@pistoncloud.com> <josh.kearney@rackspace.com>
+<josh.kearney@pistoncloud.com> <josh@jk0.org>
<justin@fathomdb.com> <justinsb@justinsb-desktop>
<kshileev@gmail.com> <kshileev@griddynamics.com>
<lorin@nimbisservices.com> <lorin@isi.edu>