Merge branch 'master' into packaging
authorKostas Papadimitriou <kpap@grnet.gr>
Mon, 23 Jan 2012 13:34:30 +0000 (15:34 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Mon, 23 Jan 2012 13:34:30 +0000 (15:34 +0200)
commitab0982ad6c707d6cc68bb084bae294de97a12549
tree9dd2270607d27ffcb7b782ad1c5933811edddb9b
parent94ca399b450302e250cc9ca838e18d4e3141f53c
parenta903e505357b94a27c253778e4e18b6784e62ddf
Merge branch 'master' into packaging

Conflicts:
pithos/settings.py
snf-pithos-app/pithos/middleware/log.py
snf-pithos-app/pithos/urls.py
snf-pithos-backend/pithos/backends/__init__.py
snf-pithos-tools/setup.py
47 files changed:
snf-pithos-app/pithos/api/faults.py
snf-pithos-app/pithos/api/functions.py
snf-pithos-app/pithos/api/public.py
snf-pithos-app/pithos/api/templatetags/get_type.py
snf-pithos-app/pithos/api/urls.py
snf-pithos-app/pithos/api/util.py
snf-pithos-app/pithos/middleware/log.py
snf-pithos-app/pithos/middleware/secure.py
snf-pithos-app/pithos/middleware/user.py
snf-pithos-app/pithos/ui/views.py
snf-pithos-app/pithos/urls.py
snf-pithos-backend/pithos/backends/__init__.py
snf-pithos-backend/pithos/backends/base.py
snf-pithos-backend/pithos/backends/lib/hashfiler/__init__.py
snf-pithos-backend/pithos/backends/lib/hashfiler/blocker.py
snf-pithos-backend/pithos/backends/lib/hashfiler/context_file.py
snf-pithos-backend/pithos/backends/lib/hashfiler/mapper.py
snf-pithos-backend/pithos/backends/lib/hashfiler/store.py
snf-pithos-backend/pithos/backends/lib/sqlalchemy/__init__.py
snf-pithos-backend/pithos/backends/lib/sqlalchemy/dbworker.py
snf-pithos-backend/pithos/backends/lib/sqlalchemy/dbwrapper.py
snf-pithos-backend/pithos/backends/lib/sqlalchemy/groups.py
snf-pithos-backend/pithos/backends/lib/sqlalchemy/node.py
snf-pithos-backend/pithos/backends/lib/sqlalchemy/permissions.py
snf-pithos-backend/pithos/backends/lib/sqlalchemy/public.py
snf-pithos-backend/pithos/backends/lib/sqlalchemy/xfeatures.py
snf-pithos-backend/pithos/backends/lib/sqlite/__init__.py
snf-pithos-backend/pithos/backends/lib/sqlite/dbworker.py
snf-pithos-backend/pithos/backends/lib/sqlite/dbwrapper.py
snf-pithos-backend/pithos/backends/lib/sqlite/groups.py
snf-pithos-backend/pithos/backends/lib/sqlite/node.py
snf-pithos-backend/pithos/backends/lib/sqlite/permissions.py
snf-pithos-backend/pithos/backends/lib/sqlite/public.py
snf-pithos-backend/pithos/backends/lib/sqlite/xfeatures.py
snf-pithos-backend/pithos/backends/modular.py
snf-pithos-lib/pithos/lib/client.py
snf-pithos-lib/pithos/lib/filter.py
snf-pithos-lib/pithos/lib/hashmap.py
snf-pithos-lib/pithos/lib/transfer.py
snf-pithos-lib/pithos/lib/util.py
snf-pithos-tools/pithos/__init__.py
snf-pithos-tools/pithos/tools/dispatcher.py
snf-pithos-tools/pithos/tools/fs.py
snf-pithos-tools/pithos/tools/sh.py
snf-pithos-tools/pithos/tools/sync.py
snf-pithos-tools/pithos/tools/test.py
snf-pithos-tools/setup.py