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

[Diogo Baeder]

Adding python-bcrypt and python-psutil

Adding python-bcrypt and python-psutil

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-04 11:47:50 +0000
+++ debian/changelog	2013-11-18 17:54:27 +0000
@@ -1,3 +1,10 @@
+canonical-identity-provider-dependencies (13.11.18) precise; urgency=low
+
+  * Added python-bcrypt to support bcrypt encryption.
+  * Added python-psutil for cypher load tests.
+
+ -- Diogo Baeder <[e-mail]>  Mon, 18 Nov 2013 17:52:03 -0200
+
 canonical-identity-provider-dependencies (13.11.04) precise; urgency=low
 
   * Added postgresql-contrib dependency to support trigram extension
@@ -18,7 +25,7 @@
 
   * added missing dependency
 
- -- Ricardo Kirkner <[e-mail]>  Wed, 26 Jun 2013 21:02:16 -0300 
+ -- Ricardo Kirkner <[e-mail]>  Wed, 26 Jun 2013 21:02:16 -0300
 
 canonical-identity-provider-dependencies (13.06.26) precise; urgency=low
 
@@ -110,7 +117,7 @@
 
   * Fixed to require django-adminaudit 0.3.3-1
 
- -- Ricardo Kirkner <[e-mail]>  Mon, 03 Sep 2012 19:44:10 -0300 
+ -- Ricardo Kirkner <[e-mail]>  Mon, 03 Sep 2012 19:44:10 -0300
 
 canonical-identity-provider-dependencies (12.09.03-1) lucid; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2013-11-04 11:47:50 +0000
+++ debian/control	2013-11-18 17:54:27 +0000
@@ -11,6 +11,7 @@
  ${misc:Depends},
  bzr,
  libapache2-mod-wsgi,
+ python-bcrypt,
  python-beautifulsoup,
  python-lxml,
  python-m2crypto,
@@ -22,6 +23,7 @@
  python-iso8601,
  python-launchpadlib,
  python-paste,
+ python-psutil,
  python-tz
 Description: Meta-package for Canonical OpenID provider dependencies