Merge lp://staging/~yolanda.robla/ubuntu/precise/keystone/essex-sru into lp://staging/ubuntu/precise-updates/keystone
Proposed by
Yolanda Robla
Status: | Merged | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merge reported by: | James Page | ||||||||||||||||||||
Merged at revision: | not available | ||||||||||||||||||||
Proposed branch: | lp://staging/~yolanda.robla/ubuntu/precise/keystone/essex-sru | ||||||||||||||||||||
Merge into: | lp://staging/ubuntu/precise-updates/keystone | ||||||||||||||||||||
Diff against target: |
33638 lines (+30158/-3073) 34 files modified
.pc/applied-patches (+0/-3) .pc/fix-ubuntu-tests.patch/tests/test_keystoneclient.py (+9/-9) .pc/keystone-CVE-2012-3542.patch/keystone/identity/core.py (+0/-625) .pc/keystone-CVE-2012-4413.patch/keystone/identity/core.py (+0/-626) .pc/keystone-CVE-2012-4413.patch/keystone/token/core.py (+0/-107) .pc/keystone-CVE-2012-4413.patch/tests/test_keystoneclient.py (+0/-970) .pc/keystone-CVE-2012-5571.patch/keystone/contrib/ec2/core.py (+0/-347) ChangeLog (+29735/-0) PKG-INFO (+10/-0) debian/changelog (+29/-0) debian/keystone.logrotate (+3/-0) debian/patches/fix-ubuntu-tests.patch (+10/-12) debian/patches/keystone-CVE-2012-3542.patch (+0/-18) debian/patches/keystone-CVE-2012-4413.patch (+0/-147) debian/patches/keystone-CVE-2012-5571.patch (+0/-62) debian/patches/series (+0/-3) doc/keystone_compat_flows.sdx (+0/-99) keystone.egg-info/PKG-INFO (+10/-0) keystone.egg-info/SOURCES.txt (+176/-0) keystone.egg-info/dependency_links.txt (+1/-0) keystone.egg-info/not-zip-safe (+1/-0) keystone.egg-info/requires.txt (+11/-0) keystone.egg-info/top_level.txt (+1/-0) keystone/identity/core.py (+4/-4) keystone/token/backends/kvs.py (+13/-8) keystone/token/backends/memcache.py (+31/-1) keystone/token/backends/sql.py (+6/-1) keystone/token/core.py (+11/-5) setup.cfg (+8/-11) setup.py (+1/-1) tests/test_backend.py (+56/-5) tests/test_backend_memcache.py (+29/-6) tests/test_keystoneclient.py (+1/-1) tools/pip-requires (+2/-2) |
||||||||||||||||||||
To merge this branch: | bzr merge lp://staging/~yolanda.robla/ubuntu/precise/keystone/essex-sru | ||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Approve | ||
Review via email:
|
This proposal supersedes a proposal from 2012-12-18.
To post a comment you must log in.
Yolanda
Minor nitpick; this branch drops an empty line from the changelog;
Other than that builds OK.