git.ganeti.org Git - ganeti-github.git/commit

projects / ganeti-github.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2827d1a 811f8b3)

author	Klaus Aehlig <aehlig@google.com>
	Wed, 24 Apr 2013 16:30:26 +0000 (18:30 +0200)
committer	Klaus Aehlig <aehlig@google.com>
	Wed, 24 Apr 2013 16:53:03 +0000 (18:53 +0200)
commit	95990bc55368300f63d9289b1b362713eb05976f
tree	0cab8fa1d0c948eec00f217abaeaf9a0d81a86ff	tree \| snapshot
parent	2827d1ac0ee7669e81e9578829b54626d3062b98	commit \| diff
parent	811f8b3131ca21e961d807eb44dddd4db500a7a0	commit \| diff

Merge branch 'stable-2.7' into stable-2.8

Conflicts:
NEWS
doc/rapi.rst

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

Makefile.am	diff1 \|	diff2 \|	blob \| history
NEWS	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
doc/rapi.rst	diff1 \|	diff2 \|	blob \| history
lib/backend.py	diff1 \|	diff2 \|	blob \| history
lib/bdev.py	diff1 \|	diff2 \|	blob \| history
lib/bootstrap.py	diff1 \|	diff2 \|	blob \| history
lib/cmdlib.py	diff1 \|	diff2 \|	blob \| history
man/gnt-cluster.rst	diff1 \|	diff2 \|	blob \| history
tools/users-setup.in	diff1 \|	diff2 \|	blob \| history

Ganeti core (mirrored from github)