code.grnet.gr Git - pithos/commit

author	Kostas Papadimitriou <kpap@grnet.gr>
	Wed, 22 Feb 2012 10:36:13 +0000 (12:36 +0200)
committer	Kostas Papadimitriou <kpap@grnet.gr>
	Wed, 22 Feb 2012 10:36:13 +0000 (12:36 +0200)
commit	883536025464cbae9aa12ae97cf20706e8ef8bc5
tree	de5e2ac158ef95813c0402fc9012a46cb6f63e3b	tree \| snapshot
parent	fa36b32692a35b7247885750eed7159e7d8ea560	commit \| diff
parent	afb8520d38552d08d804763aa6ab76796da42351	commit \| diff

Merge commit 'v0.9.0' into packaging

Conflicts:
pithos/__init__.py
pithos/api/management/commands/__init__.py
pithos/backends/lib/rabbitmq/__init__.py
pithos/backends/lib/rabbitmq/queue.py
pithos/lib/user.py
pithos/middleware/user.py
pithos/settings.py
pithos/ui/__init__.py
pithos/ui/urls.py
pithos/ui/views.py
snf-pithos-app/pithos/api/settings.py
snf-pithos-app/pithos/middleware/log.py
snf-pithos-app/pithos/middleware/user.py
snf-pithos-app/pithos/ui/settings.py
snf-pithos-app/pithos/ui/templates/feedback_mail.txt
snf-pithos-app/pithos/ui/views.py
snf-pithos-lib/pithos/lib/__init__.py
snf-pithos-tools/pithos/__init__.py
snf-pithos-tools/pithos/tools/dispatcher.py

40 files changed:

snf-pithos-app/pithos/api/functions.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/management/__init__.py	\|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/management/commands/__init__.py	\|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/management/commands/storagequota.py	\|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/public.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/settings.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/synnefo_settings.py	\|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/urls.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/util.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/middleware/__init__.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/middleware/log.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/urls.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/base.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/hashfiler/blocker.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/hashfiler/mapper.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/hashfiler/store.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/rabbitmq/__init__.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/rabbitmq/queue.py	\|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlalchemy/__init__.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlalchemy/groups.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlalchemy/node.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlalchemy/permissions.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlalchemy/public.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlalchemy/xfeatures.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlite/__init__.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlite/node.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlite/permissions.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlite/public.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlite/xfeatures.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/modular.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-lib/pithos/lib/client.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-lib/pithos/lib/dictconfig.py	\|	diff2 \|	blob \| history
snf-pithos-lib/pithos/lib/queue.py	\|	diff2 \|	blob \| history
snf-pithos-lib/pithos/lib/user.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-lib/pithos/lib/util.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-tools/pithos/tools/dispatcher.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-tools/pithos/tools/fs.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-tools/pithos/tools/sh.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-tools/pithos/tools/sync.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-tools/pithos/tools/test.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

snf-pithos-app/pithos/api/functions.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/management/__init__.py	\|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/management/commands/__init__.py	\|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/management/commands/storagequota.py	\|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/public.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/settings.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/synnefo_settings.py	\|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/urls.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/api/util.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/middleware/__init__.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/middleware/log.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-app/pithos/urls.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/base.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/hashfiler/blocker.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/hashfiler/mapper.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/hashfiler/store.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/rabbitmq/__init__.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/rabbitmq/queue.py	\|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlalchemy/__init__.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlalchemy/groups.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlalchemy/node.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlalchemy/permissions.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlalchemy/public.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlalchemy/xfeatures.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlite/__init__.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlite/node.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlite/permissions.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlite/public.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/lib/sqlite/xfeatures.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-backend/pithos/backends/modular.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-lib/pithos/lib/client.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-lib/pithos/lib/dictconfig.py	\|	diff2 \|	blob \| history
snf-pithos-lib/pithos/lib/queue.py	\|	diff2 \|	blob \| history
snf-pithos-lib/pithos/lib/user.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-lib/pithos/lib/util.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-tools/pithos/tools/dispatcher.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-tools/pithos/tools/fs.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-tools/pithos/tools/sh.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-tools/pithos/tools/sync.py	diff1 \|	diff2 \|	blob \| history
snf-pithos-tools/pithos/tools/test.py	diff1 \|	diff2 \|	blob \| history