« Previous | Next » 

Revision cfd39ba2

IDcfd39ba24381c775cfff73ee3a090c0e4eb4fe05

Added by Georgios D. Tsoukalas almost 9 years ago

Merge branch 'feature-fix-service-version-numbers' into feature-reconfigure-settings

Conflicts:
snf-astakos-app/astakos/im/tests/api.py
snf-common/synnefo/lib/services.py
snf-cyclades-app/synnefo/api/tests/flavors.py
snf-cyclades-app/synnefo/api/tests/images.py
snf-cyclades-app/synnefo/api/tests/networks.py
snf-cyclades-app/synnefo/api/tests/servers.py
snf-cyclades-app/synnefo/api/tests/versions.py
snf-cyclades-app/synnefo/plankton/tests.py
snf-cyclades-app/synnefo/ui/settings.py
snf-cyclades-app/synnefo/vmapi/tests.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted