Merge "Throw an user error on creating duplicate keypairs Fixes bug 902162"
This commit is contained in:
		
							
								
								
									
										3
									
								
								.mailmap
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								.mailmap
									
									
									
									
									
								
							@@ -41,7 +41,8 @@
 | 
				
			|||||||
<matt.dietz@rackspace.com> <mdietz@openstack>
 | 
					<matt.dietz@rackspace.com> <mdietz@openstack>
 | 
				
			||||||
<mordred@inaugust.com> <mordred@hudson>
 | 
					<mordred@inaugust.com> <mordred@hudson>
 | 
				
			||||||
<naveedm9@gmail.com> <naveed.massjouni@rackspace.com>
 | 
					<naveedm9@gmail.com> <naveed.massjouni@rackspace.com>
 | 
				
			||||||
<nirmal.ranganathan@rackspace.com> <nirmal.ranganathan@rackspace.coom>
 | 
					<rnirmal@gmail.com> <nirmal.ranganathan@rackspace.com>
 | 
				
			||||||
 | 
					<rnirmal@gmail.com> <nirmal.ranganathan@rackspace.coom>
 | 
				
			||||||
<paul@openstack.org> <paul.voccio@rackspace.com>
 | 
					<paul@openstack.org> <paul.voccio@rackspace.com>
 | 
				
			||||||
<paul@openstack.org> <pvoccio@castor.local>
 | 
					<paul@openstack.org> <pvoccio@castor.local>
 | 
				
			||||||
<paul@openstack.org> <paul@substation9.com>
 | 
					<paul@openstack.org> <paul@substation9.com>
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								Authors
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Authors
									
									
									
									
									
								
							@@ -123,7 +123,7 @@ Muneyuki Noguchi <noguchimn@nttdata.co.jp>
 | 
				
			|||||||
Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
 | 
					Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
 | 
				
			||||||
Naveed Massjouni <naveedm9@gmail.com>
 | 
					Naveed Massjouni <naveedm9@gmail.com>
 | 
				
			||||||
Nikolay Sokolov <nsokolov@griddynamics.com>
 | 
					Nikolay Sokolov <nsokolov@griddynamics.com>
 | 
				
			||||||
Nirmal Ranganathan <nirmal.ranganathan@rackspace.com>
 | 
					Nirmal Ranganathan <rnirmal@gmail.com>
 | 
				
			||||||
Ollie Leahy <oliver.leahy@hp.com>
 | 
					Ollie Leahy <oliver.leahy@hp.com>
 | 
				
			||||||
Pádraig Brady <pbrady@redhat.com>
 | 
					Pádraig Brady <pbrady@redhat.com>
 | 
				
			||||||
Paul Voccio <paul@openstack.org>
 | 
					Paul Voccio <paul@openstack.org>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user