projects / ganeti-github.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 25f8d59 7d60c3b)
Merge stable-2.7 into stable-2.8
authorMichele Tartara <mtartara@google.com>
Fri, 3 May 2013 08:10:43 +0000 (10:10 +0200)
committerMichele Tartara <mtartara@google.com>
Fri, 3 May 2013 08:38:15 +0000 (10:38 +0200)
commitbcba4e013eee9eac35943efde857de13f6f8b878
tree7037882f7a2ad05cc1ed26a654440c6bb1bb8f81tree | snapshot
parent25f8d59cfe59dd214bfc17283b2b75401d6e79a3commit | diff
parent7d60c3b508d7cad9053443adbdfcfb91191e5e9fcommit | diff
Merge stable-2.7 into stable-2.8

Conflicts:
INSTALL
NEWS
configure.ac
src/Ganeti/Query/Group.hs
test/hs/Test/Ganeti/Objects.hs
test/hs/Test/Ganeti/Query/Query.hs

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>
16 files changed:
INSTALL diff1 | diff2 | blob | history
Makefile.am diff1 | diff2 | blob | history
NEWS diff1 | diff2 | blob | history
UPGRADE diff1 | diff2 | blob | history
configure.ac diff1 | diff2 | blob | history
doc/admin.rst diff1 | diff2 | blob | history
doc/install.rst diff1 | diff2 | blob | history
lib/bdev.py diff1 | diff2 | blob | history
lib/cmdlib.py diff1 | diff2 | blob | history
lib/constants.py diff1 | diff2 | blob | history
lib/hypervisor/hv_kvm.py diff1 | diff2 | blob | history
lib/hypervisor/hv_xen.py diff1 | diff2 | blob | history
man/gnt-instance.rst diff1 | diff2 | blob | history
src/Ganeti/Query/Server.hs diff1 | diff2 | blob | history
src/Ganeti/THH.hs diff1 | diff2 | blob | history
tools/move-instance diff1 | diff2 | blob | history
Ganeti core (mirrored from github)