Canonical SSO provider

Merge lp:~diogobaeder/canonical-identity-provider/psutil-deps into lp:~canonical-isd-hackers/canonical-identity-provider/dependencies

  1. psutil-deps
  2. Merge into dependencies
Proposed by Diogo Baeder
Status: Merged
Approved by: Diogo Baeder
Approved revision: 49
Merged at revision: 49
Proposed branch: lp:~diogobaeder/canonical-identity-provider/psutil-deps
Merge into: lp:~canonical-isd-hackers/canonical-identity-provider/dependencies
Diff against target: 51 lines (+11/-2)
2 files modified
debian/changelog (+9/-2)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~diogobaeder/canonical-identity-provider/psutil-deps
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+195647@code.launchpad.net

This proposal supersedes a proposal from 2013-11-18.

Commit message

Adding python-bcrypt and python-psutil

Description of the change

Adding python-bcrypt and python-psutil

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-11-04 11:47:50 +0000
3+++ debian/changelog 2013-11-18 17:54:27 +0000
4@@ -1,3 +1,10 @@
5+canonical-identity-provider-dependencies (13.11.18) precise; urgency=low
6+
7+ * Added python-bcrypt to support bcrypt encryption.
8+ * Added python-psutil for cypher load tests.
9+
10+ -- Diogo Baeder <diogo.baeder@canonical.com> Mon, 18 Nov 2013 17:52:03 -0200
11+
12 canonical-identity-provider-dependencies (13.11.04) precise; urgency=low
13
14 * Added postgresql-contrib dependency to support trigram extension
15@@ -18,7 +25,7 @@
16
17 * added missing dependency
18
19- -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 26 Jun 2013 21:02:16 -0300
20+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 26 Jun 2013 21:02:16 -0300
21
22 canonical-identity-provider-dependencies (13.06.26) precise; urgency=low
23
24@@ -110,7 +117,7 @@
25
26 * Fixed to require django-adminaudit 0.3.3-1
27
28- -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 03 Sep 2012 19:44:10 -0300
29+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 03 Sep 2012 19:44:10 -0300
30
31 canonical-identity-provider-dependencies (12.09.03-1) lucid; urgency=low
32
33
34=== modified file 'debian/control'
35--- debian/control 2013-11-04 11:47:50 +0000
36+++ debian/control 2013-11-18 17:54:27 +0000
37@@ -11,6 +11,7 @@
38 ${misc:Depends},
39 bzr,
40 libapache2-mod-wsgi,
41+ python-bcrypt,
42 python-beautifulsoup,
43 python-lxml,
44 python-m2crypto,
45@@ -22,6 +23,7 @@
46 python-iso8601,
47 python-launchpadlib,
48 python-paste,
49+ python-psutil,
50 python-tz
51 Description: Meta-package for Canonical OpenID provider dependencies
52

Subscribers

People subscribed via source and target branches