« Previous | Next » 

Revision 890f3d4c

ID890f3d4c91ec898f4525130dd0bb393f038c75ed

Added by Christos Stavrakakis over 8 years ago

Merge branch 'hotfix-0.14.2' into develop

Conflicts:
Changelog
snf-astakos-app/astakos/im/messages.py
snf-astakos-app/astakos/im/views/target/__init__.py
snf-cyclades-app/synnefo/logic/backend.py
snf-cyclades-app/synnefo/logic/management/commands/reconcile-servers.py
snf-pithos-backend/pithos/backends/lib/sqlalchemy/node.py
snf-pithos-backend/pithos/backends/lib/sqlite/node.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted