Merge branch 'master' of https://code.grnet.gr/git/pithos

diff --git a/snf-pithos-app/Changelog b/snf-pithos-app/Changelog
index 0640695..caa1c80 100644 (file)
--- a/snf-pithos-app/Changelog
+++ b/snf-pithos-app/Changelog
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+dev
+---
+* Do not use sample authentication users by default.
+
+v0.9.6
+------
+* Backend umask support
+
 v0.9.5
 ------
 * Calculate the length of the last block properly. 

diff --git a/snf-pithos-app/pithos/api/settings.py b/snf-pithos-app/pithos/api/settings.py
index c842342..ad56a47 100644 (file)
--- a/snf-pithos-app/pithos/api/settings.py
+++ b/snf-pithos-app/pithos/api/settings.py
@@ -16,7 +16,7 @@ sample_users = {
 }
 
 AUTHENTICATION_URL = getattr(settings, 'PITHOS_AUTHENTICATION_URL', 'http://127.0.0.1:8000/im/authenticate')
-AUTHENTICATION_USERS = getattr(settings, 'PITHOS_AUTHENTICATION_USERS', sample_users)
+AUTHENTICATION_USERS = getattr(settings, 'PITHOS_AUTHENTICATION_USERS', {})
 
 COOKIE_NAME = getattr(settings, 'ASTAKOS_COOKIE_NAME', '_pithos2_a')
 
@@ -41,4 +41,4 @@ BACKEND_VERSIONING = getattr(settings, 'PITHOS_BACKEND_VERSIONING', 'auto')
 UPDATE_MD5 = getattr(settings, 'PITHOS_UPDATE_MD5', True)
 
 # Service Token acquired by identity provider.
-SERVICE_TOKEN = getattr(settings, 'PITHOS_SERVICE_TOKEN', '')
\ No newline at end of file
+SERVICE_TOKEN = getattr(settings, 'PITHOS_SERVICE_TOKEN', '')

diff --git a/snf-pithos-backend/Changelog b/snf-pithos-backend/Changelog
index 43e0a19..e9540be 100644 (file)
--- a/snf-pithos-backend/Changelog
+++ b/snf-pithos-backend/Changelog
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+v0.9.6
+------
+* Use umask parameter in ModularBackend 
+
 v0.9.4
 ------
 * Overwrite permissions every time.

diff --git a/snf-pithos-tools/Changelog b/snf-pithos-tools/Changelog
index 9f6f2d4..9511b6d 100644 (file)
--- a/snf-pithos-tools/Changelog
+++ b/snf-pithos-tools/Changelog
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+v0.9.6
+------
+* Fix double content-type header 
+* Fix missing import
+
 v0.9.5
 ------
 * fix pithos-sh put using hashmaps.