« Previous | Next » 

Revision 2492a42c

ID2492a42c880e59d008d3aa60d8f5dcc4bebb80e4
Parent 47462eda, b6c16e87
Child df8debbb

Added by Filippos Giannakos over 8 years ago

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
snf-pithos-backend/pithos/backends/util.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted