[Merge] lp:~markwash/keystone/ubuntu into lp:~openstack-ubuntu-packagers/keystone/ubuntu

[Mark Washenberger]

Mark Washenberger has proposed merging lp:~markwash/keystone/ubuntu into lp:~openstack-ubuntu-packagers/keystone/ubuntu.

Requested reviews:
  OpenStack Ubuntu packagers (openstack-ubuntu-packagers)
Related bugs:
  Bug #898343 in Keystone: "conflicting sqlite dependencies"
  https://bugs.launchpad.net/keystone/+bug/898343

For more details, see:
https://code.launchpad.net/~markwash/keystone/ubuntu/+merge/84010

I am not presently able to test this, but it looks like it should fix the conflicting dependencies on both python-pysqlite1.1 and python-sqlite.
-- 
https://code.launchpad.net/~markwash/keystone/ubuntu/+merge/84010
Your team OpenStack Ubuntu packagers is requested to review the proposed merge of lp:~markwash/keystone/ubuntu into lp:~openstack-ubuntu-packagers/keystone/ubuntu.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 356 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/openstack-packaging/attachments/20111130/870cb551/attachment.diff>