projects / kamaki / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6ca5607 4443152)
Merge branch 'release-0.9'
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 20 Jun 2013 13:34:23 +0000 (16:34 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 20 Jun 2013 13:34:23 +0000 (16:34 +0300)
commitc522b8ec7a16fadcbbfbe4d60412c2fe72ce0fa2
tree09c6e0da091dbfa967f9198ae012f38c417ea2a7tree | snapshot
parent6ca560776e03e9a807fbca40b3a7e1276df7d3bacommit | diff
parent4443152f18a0a2d69b87af7320ccda1a53153045commit | diff
Merge branch 'release-0.9'

Conflicts:
Changelog
README.Upgrade
docs/conf.py
docs/installation.rst
docs/setup.rst
kamaki/cli/argument.py
kamaki/cli/commands/astakos.py
kamaki/cli/commands/image.py
kamaki/cli/commands/pithos.py
kamaki/cli/logger.py
kamaki/clients/__init__.py
kamaki/clients/pithos/__init__.py
version
README.Upgrade diff1 | diff2 | blob | history
docs/conf.py diff1 | diff2 | blob | history
docs/installation.rst diff1 | diff2 | blob | history
version diff1 | diff2 | blob | history
Kamaki