commit 801d5af4a42889088b78844bc26ba5f1bf5af33c
Merge: 9de9821 c4b5c16
Author: Klaus Aehlig <[email protected]>
Date: Tue Nov 4 15:03:11 2014 +0100
Merge branch 'stable-2.11' into stable-2.12
* stable-2.11
(no changes)
* stable-2.10
Fix python shebang line in tools as well
Do not hard-code python path
Signed-off-by: Klaus Aehlig <[email protected]>
diff --cc Makefile.am
index d763c32,84bc39d..683507a
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1363,11 -1220,10 +1379,12 @@@ EXTRA_DIST =
devel/upload \
devel/webserver \
tools/kvm-ifup.in \
+ tools/ifup-os.in \
tools/vif-ganeti.in \
+ tools/vif-ganeti-metad.in \
tools/net-common.in \
tools/vcluster-setup.in \
+ $(python_scripts) \
$(docinput) \
doc/html \
$(BUILT_EXAMPLES:%=%.in) \
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
