Merge lp:~zulcss/keystone/keystone-refreshed into lp:~ubuntu-server-dev/keystone/havana

[Chuck Short]

[Andres Rodriguez (andreserl)]

lgtm! Might be worth adding a changelog entry

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-11 20:11:18 +0000
+++ debian/changelog	2013-06-20 14:41:50 +0000
@@ -1,4 +1,4 @@
-keystone (1:2013.2.b1.46.gb3e4969-0ubuntu1) UNRELEASED; urgency=low
+keystone (1:2013.2.b1.111.g7ccfac7-0ubuntu1) UNRELEASED; urgency=low
 
   [ Adam Gandelman ]
   * debian/patches/*: Refresh
 
=== modified file 'debian/patches/sql_connection.patch'
--- debian/patches/sql_connection.patch	2013-06-06 18:10:33 +0000
+++ debian/patches/sql_connection.patch	2013-06-20 14:41:50 +0000
@@ -1,6 +1,6 @@
-diff -Naurp keystone-2013.2.b1.46.gb3e4969.orig/etc/keystone.conf.sample keystone-2013.2.b1.46.gb3e4969/etc/keystone.conf.sample
---- keystone-2013.2.b1.46.gb3e4969.orig/etc/keystone.conf.sample	2013-06-06 13:02:21.000000000 -0500
-+++ keystone-2013.2.b1.46.gb3e4969/etc/keystone.conf.sample	2013-06-06 13:09:45.325872902 -0500
+diff -Naurp keystone-2013.2.b1.111.g7ccfac7.orig/etc/keystone.conf.sample keystone-2013.2.b1.111.g7ccfac7/etc/keystone.conf.sample
+--- keystone-2013.2.b1.111.g7ccfac7.orig/etc/keystone.conf.sample	2013-06-20 09:05:17.000000000 -0500
++++ keystone-2013.2.b1.111.g7ccfac7/etc/keystone.conf.sample	2013-06-20 09:22:24.191764787 -0500
 @@ -52,10 +52,10 @@
  # verbose = False
  
@@ -51,7 +51,7 @@
  # template_file = default_catalog.templates
  
  [token]
--# driver = keystone.token.backends.kvs.Token
+-# driver = keystone.token.backends.sql.Token
 +driver = keystone.token.backends.sql.Token
  
  # Amount of time a token should remain valid (in seconds)
@@ -63,7 +63,7 @@
  
  [ec2]
 -# driver = keystone.contrib.ec2.backends.kvs.Ec2
-+driver = keystone.contrib.ec2.backends.sql.Ec2
++driver = keystone.contrib.ec2.backends.kvs.Ec2
  
  [ssl]
  #enable = True