Merge lp:~michael.nelson/canonical-identity-provider/dependencies-update-1487 into lp:~ubuntuone-pqm-team/canonical-identity-provider/dependencies

Proposed by Michael Nelson
Status: Merged
Approved by: Michael Nelson
Approved revision: 65
Merged at revision: 65
Proposed branch: lp:~michael.nelson/canonical-identity-provider/dependencies-update-1487
Merge into: lp:~ubuntuone-pqm-team/canonical-identity-provider/dependencies
Diff against target: 6 lines (+0/-0)
0 files modified
To merge this branch: bzr merge lp:~michael.nelson/canonical-identity-provider/dependencies-update-1487
Reviewer Review Type Date Requested Status
Thomi Richards (community) Approve
Review via email: mp+296896@code.launchpad.net

Commit message

Revert reversion - removing deps that are now no longer needed as staging has deployed r1487

Description of the change

This just reverts r64 from:

https://code.launchpad.net/~michael.nelson/canonical-identity-provider/dependencies-fix-for-r1483/+merge/296892

now that CI has passed and published r1487:

https://jenkins.canonical.com/is-mojo-ci/job/live-u1-canonical-identity-provider/2658/console

and staging has updated:

$ curl -sI https://login.staging.ubuntu.com | grep X-Bzr
X-Bzr-Revision-Number: 1487

(though it's still in RO mode)

To post a comment you must log in.
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

<cough> old deps are also needed by devs working on branches that haven't merged trunk yet.

So, in general, it's my understanding that old deps should remain in place for $long time.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'django_modeldict-1.4.1-py2-none-any.whl'
2Binary files django_modeldict-1.4.1-py2-none-any.whl 2016-06-09 01:59:51 +0000 and django_modeldict-1.4.1-py2-none-any.whl 1970-01-01 00:00:00 +0000 differ
3=== removed file 'gargoyle-0.11.0-py2.py3-none-any.whl'
4Binary files gargoyle-0.11.0-py2.py3-none-any.whl 2016-06-09 01:59:51 +0000 and gargoyle-0.11.0-py2.py3-none-any.whl 1970-01-01 00:00:00 +0000 differ
5=== removed file 'nexus-0.3.1-py2.py3-none-any.whl'
6Binary files nexus-0.3.1-py2.py3-none-any.whl 2016-06-09 01:59:51 +0000 and nexus-0.3.1-py2.py3-none-any.whl 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches