[Merge] lp:~corey.bryant/keystone/2014.1.3-0ubuntu3 into lp:~ubuntu-server-dev/keystone/icehouse

[Corey Bryant]

Corey Bryant has proposed merging lp:~corey.bryant/keystone/2014.1.3-0ubuntu3 into lp:~ubuntu-server-dev/keystone/icehouse.

Requested reviews:
  Ubuntu Server Developers (ubuntu-server-dev)
Related bugs:
  Bug #1354208 in Keystone: "[OSSA 2014-029] Catalog replacement allows reading config (CVE-2014-3621)"
  https://bugs.launchpad.net/keystone/+bug/1354208
  Bug #1403114 in keystone (Ubuntu): "[SRU] icehouse package needs python-six 1.5.2-1 dependency"
  https://bugs.launchpad.net/ubuntu/+source/keystone/+bug/1403114

For more details, see:
https://code.launchpad.net/~corey.bryant/keystone/2014.1.3-0ubuntu3/+merge/244895
-- 
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~corey.bryant/keystone/2014.1.3-0ubuntu3 into lp:~ubuntu-server-dev/keystone/icehouse.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1258 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20141216/6a2d6dba/attachment.diff>