-
Christos Stavrakakis authored
Conflicts: Changelog docs/admin-guide.rst snf-astakos-app/astakos/admin/stats.py snf-astakos-app/astakos/scripts/snf-component-register snf-branding/setup.py snf-common/conf/00-snf-common-admins.conf snf-common/synnefo/lib/amqp/amqp_puka.py snf-cyclades-app/synnefo/admin/stats.py snf-cyclades-app/synnefo/admin/views.py snf-cyclades-app/synnefo/logic/backend.py snf-cyclades-app/synnefo/logic/callbacks.py snf-cyclades-app/synnefo/logic/dispatcher.py snf-cyclades-app/synnefo/logic/ips.py snf-cyclades-app/synnefo/logic/management/commands/stats-cyclades.py snf-cyclades-app/synnefo/logic/servers.py snf-cyclades-app/synnefo/management/pprint.py snf-cyclades-app/synnefo/plankton/views.py snf-cyclades-app/synnefo/ui/static/snf/js/neutron.js snf-cyclades-app/synnefo/ui/static/snf/js/ui/web/ui_networks_view.js snf-deploy/conf/nodes.conf snf-pithos-app/conf/20-snf-pithos-app-settings.conf snf-pithos-app/pithos/api/functions.py snf-pithos-app/pithos/api/test/objects.py snf-pithos-app/pithos/api/test/public.py snf-pithos-app/pithos/api/test/views.py snf-pithos-app/pithos/api/util.py snf-pithos-backend/pithos/backends/lib/hashfiler/archipelagoblocker.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/context_object.py snf-pithos-backend/pithos/backends/lib/hashfiler/mapper.py snf-pithos-backend/pithos/backends/lib/hashfiler/radosmapper.py snf-pithos-backend/pithos/backends/lib/hashfiler/store.py snf-pithos-backend/pithos/backends/modular.py snf-pithos-backend/pithos/backends/util.py snf-tools/synnefo_tools/burnin/common.py version
78b48b77