projects / kamaki / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0baa648 0db8331)
Merge branch 'release-0.12' 0.12
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 16 Dec 2013 11:13:08 +0000 (13:13 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 16 Dec 2013 11:13:08 +0000 (13:13 +0200)
commit81cf516b0da5f62cd2087a849a905ac2c508a6b2
tree50fabb69af50dd515979f2c64ac77c3e6281f070tree | snapshot
parent0baa648abd50a255659121ab69a34c69f307f858commit | diff
parent0db8331fbc0c4576979bc58af2ef67e664c2c846commit | diff
Merge branch 'release-0.12'

Conflicts:
Changelog
docs/conf.py
kamaki/cli/commands/cyclades.py
kamaki/cli/commands/image.py
kamaki/cli/commands/pithos.py
setup.py
version
README.Upgrade diff1 | diff2 | blob | history
docs/conf.py diff1 | diff2 | blob | history
docs/examplesdir/imageregister.rst diff1 | diff2 | blob | history
setup.py diff1 | diff2 | blob | history
version diff1 | diff2 | blob | history
Kamaki