Merge lp:~gandelman-a/ubuntu/raring/keystone/2013.1.2 into lp:~openstack-ubuntu-testing/keystone/grizzly

[Adam Gandelman]

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-17 10:12:10 +0000
+++ debian/changelog	2013-06-07 20:54:32 +0000
@@ -1,3 +1,20 @@
+keystone (2013.1.2-0ubuntu1) raring-proposed; urgency=low
+
+  * Resynchronize with stable/grizzly (8dd57da1) (LP: #1188788):
+    - [8dd57da] Migration 020 incorrectly assigns roles. LP: 1186128
+    - [81a4d38] Removing a user from a project would result to all members of
+      that project to be removed LP: 1170649
+    - [39c4ca1] default_domain_id breaks the ability to map keystone  to ldap
+      LP: 1168726
+    - [69d0733] Lacking initial rule for list_groups_for_user operation in
+      sample policy.json LP: 1167836
+    - [45fa69b] LDAP list group users should not fail if user entry deleted
+      LP: 1174585
+    - [6090bbe] Update sample_data.sh to match docs  LP: 1073291
+    - [a00bab7] use swift stable branch
+
+ -- Adam Gandelman <[e-mail]>  Fri, 07 Jun 2013 13:27:28 -0400
+
 keystone (1:2013.1.1-0ubuntu2) raring-proposed; urgency=low
 
   * Rebase against latest security updates.