From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Dec 2012 11:07:01 +0000 (+0100)
Subject: merge from develop
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=a3b483e5978df4273c1e187ac029f4225c4ba6d9;p=profitbricks%2Fjenkins-build-scripts.git

merge from develop
---

a3b483e5978df4273c1e187ac029f4225c4ba6d9
diff --cc liveboot_testdeploy.sh
index c1be952,57e00e8..3131ccd
--- a/liveboot_testdeploy.sh
+++ b/liveboot_testdeploy.sh
@@@ -12,10 -12,7 +12,6 @@@ TESTSERVER=pserver
  TESTSERVER_MGMT_IP=192.168.178.49
  TESTSERVER_MGMT_PASSWD_FILE=/etc/jenkins/pserver2.ipmi
  
- ##TFTP_TARGET=/srv/tftp/liveboot
- ##HTTP_TARGET=/var/www/liveboot/
- 
--
  #
  # check if we have a LIVEBOOT_BUILD_NUMBER
  #