On 11/03/2014 07:15 PM, 'Klaus Aehlig' via ganeti-devel wrote:
commit 21bdec42a788be94145cb24c2a5a66ebb08893a8 Merge: abba7d4 d6b695c Author: Klaus Aehlig <[email protected]> Date: Mon Nov 3 18:46:39 2014 +0100 Merge branch 'stable-2.10' into stable-2.11 * stable-2.10 Fix python shebang line in tools as well Do not hard-code python path Conflicts: Makefile.am (trivial) Signed-off-by: Klaus Aehlig <[email protected]> diff --cc Makefile.am index 15dc269,dbe867e..84bc39d --- a/Makefile.am +++ b/Makefile.am @@@ -291,10 -286,16 +293,13 @@@ GENERATED_FILES = $(PYTHON_BOOTSTRAP) \ $(gnt_python_sbin_SCRIPTS) + clean-local: + rm -rf tools/shebang + -HS_GENERATED_FILES = -if WANT_HTOOLS -HS_GENERATED_FILES += $(HS_PROGS) +HS_GENERATED_FILES = $(HS_PROGS) src/hluxid src/ganeti-luxid if ENABLE_CONFD -HS_GENERATED_FILES += src/hconfd src/ganeti-confd src/hluxid src/ganeti-luxid +HS_GENERATED_FILES += src/hconfd src/ganeti-confd endif - if ENABLE_MOND HS_GENERATED_FILES += src/ganeti-mond endif
LGTM -- Niklas Hambüchen Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
