From f617fc087367a3d65bd4b826bf735f65fec9d2fd Mon Sep 17 00:00:00 2001
From: Masanori Itoh <itoumsn@nttdata.co.jp>
Date: Thu, 3 Mar 2011 00:28:04 +0900
Subject: Change DescribeKeyPairs response tag from keypairsSet to keySet, and
 fix lp720133.

---
 nova/api/ec2/cloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 844ccbe5e..c6309f03c 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -298,7 +298,7 @@ class CloudController(object):
                     'keyFingerprint': key_pair['fingerprint'],
                 })
 
-        return {'keypairsSet': result}
+        return {'keySet': result}
 
     def create_key_pair(self, context, key_name, **kwargs):
         LOG.audit(_("Create key pair %s"), key_name, context=context)
-- 
cgit 


From f9cce74cad854d377de113a619dc42df10b9a2ba Mon Sep 17 00:00:00 2001
From: Masanori Itoh <itoumsn@nttdata.co.jp>
Date: Thu, 3 Mar 2011 14:10:42 +0900
Subject: Updated Authors and .mailmap

---
 .mailmap | 1 +
 Authors  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index df012e066..ed4404ad5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -15,6 +15,7 @@
 <corywright@gmail.com> <cory.wright@rackspace.com>
 <devin.carlen@gmail.com> <devcamcar@illian.local>
 <ewan.mellor@citrix.com> <emellor@silver>
+<itoumsn@nttdata.co.jp> <itoumsn@shayol>
 <jaypipes@gmail.com> <jpipes@serialcoder>
 <jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local>
 <jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>
diff --git a/Authors b/Authors
index b279d8a53..7993955e2 100644
--- a/Authors
+++ b/Authors
@@ -39,6 +39,7 @@ Ken Pepple <ken.pepple@gmail.com>
 Kevin L. Mitchell <kevin.mitchell@rackspace.com>
 Koji Iida <iida.koji@lab.ntt.co.jp>
 Lorin Hochstein <lorin@isi.edu>
+Masanori Itoh <itoumsn@nttdata.co.jp>
 Matt Dietz <matt.dietz@rackspace.com>
 Michael Gundlach <michael.gundlach@rackspace.com>
 Monsyne Dragon <mdragon@rackspace.com>
-- 
cgit 


From 26c217d1f16b100b9dc615388ee315e6daf336ce Mon Sep 17 00:00:00 2001
From: Masanori Itoh <itoumsn@nttdata.co.jp>
Date: Fri, 4 Mar 2011 00:30:19 +0900
Subject: Updated DescribeKeyPairs response tag checked in
 nova/tests/test_cloud.py

---
 nova/tests/test_cloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py
index 061910013..b195fa520 100644
--- a/nova/tests/test_cloud.py
+++ b/nova/tests/test_cloud.py
@@ -267,7 +267,7 @@ class CloudTestCase(test.TestCase):
         self._create_key('test1')
         self._create_key('test2')
         result = self.cloud.describe_key_pairs(self.context)
-        keys = result["keypairsSet"]
+        keys = result["keySet"]
         self.assertTrue(filter(lambda k: k['keyName'] == 'test1', keys))
         self.assertTrue(filter(lambda k: k['keyName'] == 'test2', keys))
 
-- 
cgit