From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 28 Sep 2012 17:04:46 +0000 (+0200)
Subject: merge branch develop
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a3160e08e8a7cd085d4b123d15c165ecd77003f4;p=profitbricks%2Fjenkins-build-scripts.git

merge branch develop
---

a3160e08e8a7cd085d4b123d15c165ecd77003f4
diff --cc add_liveboot_request.py
index cf01955,3bba3ab..7adf175
--- a/add_liveboot_request.py
+++ b/add_liveboot_request.py
@@@ -8,15 -8,14 +8,17 @@@
  __author__ = "Fabian Holler <fabian.holler@profitbricks.com>"
  
  from cidb import *
+ from common_code import *
  import sys
  import psycopg2
- import logging
  import pwd
  
+ logger = logger_init()
+ 
  
 +logger = logging.getLogger()
 +
 +
  def get_default_pkg_list_id(con):
      """ Returns the package_list_id for the default package_list. """