Merge pull request #391 from grischa/carlo-aaf-merge

Carlo aaf merge
mytardis · Feb 24, 2015 · 3356f0b · 3356f0b
2 parents a3115c9 + 5787b02
commit 3356f0b
Show file tree

Hide file tree

Showing 5 changed files with 334 additions and 142 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -26,6 +26,7 @@ gunicorn
 gevent
 iso8601==0.1.4 #apt: 0.1.10
 isodate==0.5.1 #apt: 0.4.6
+pyjwt==0.4.3
 kombu==3.0.24 #apt: 3.0.7
 lxml==3.2.1 #apt: 3.3.3
 mimeparse==0.1.3 #apt: 0.1.4

diff --git a/tardis/tardis_portal/auth/jwt.py b/tardis/tardis_portal/auth/jwt.py