History | View | Annotate | Download (4.8 kB)
fix radosblocker merge, fix some tabs/whitespace
Merge branch 'radosblocker' of https://code.grnet.gr/git/pithos into latest-quota
Conflicts: snf-pithos-app/pithos/api/util.py snf-pithos-backend/pithos/backends/modular.py snf-pithos-backend/pithos/backends/util.py
Pithos backend should send the token to the quotaholder
Merge remote-tracking branch 'origin/dev' into radosblocker
Conflicts: snf-pithos-app/pithos/api/util.py snf-pithos-backend/pithos/backends/lib/hashfiler/blocker.py snf-pithos-backend/pithos/backends/lib/hashfiler/mapper.py snf-pithos-backend/pithos/backends/modular.py...
make rados storage configurable
Merge branch 'dev' of https://code.grnet.gr/git/pithos into dev
Conflicts: snf-pithos-app/pithos/api/util.py snf-pithos-backend/pithos/backends/modular.py
By default report size change in object delete/update (do not include older version size)
Move PithosBackendPool to snf-pithos-backend
Move PithosBackendPool from snf-pithos-app to snf-pithos-backend