Revision 902835ba
| ID | 902835ba5b023e7cda31e02c398d2daa1b8b8a8d |
Merge branch 'feature-endpoints' into release-0.9
Conflicts:
Changelog
kamaki/cli/__init__.py
kamaki/cli/commands/astakos.py
kamaki/cli/commands/cyclades.py
kamaki/cli/commands/image.py
kamaki/cli/commands/pithos.py
kamaki/cli/commands/snf-astakos.py
kamaki/cli/config.py
kamaki/cli/errors.py
Files
- added
- modified
- copied
- renamed
- deleted