History | View | Annotate | Download (964 Bytes)
Merge branch 'release-0.13' into develop
Conflicts: snf-cyclades-app/synnefo/api/management/commands/cyclades-export-quota.py snf-cyclades-app/synnefo/api/management/commands/network-list.py snf-cyclades-app/synnefo/api/management/commands/server-inspect.py...
Make snf-pithos-tools obsolete
Move the directory under contrib and remove the correspondingentry from `devflow.conf'.
Initialize snf-astakos-client
'Port' snf-stats-app to devflow
Do not automatically update version files
Do not automatically update version files from setup.py. From nowon, version files are updated using 'update_version.py' script and'devflow'.
Also removed autopkg.conf and created devflow.conf configuration file.