Merge branch 'master' into install

This commit is contained in:
Nico Schottelius 2011-09-23 14:22:20 +02:00
commit 9c7e0e358c

View file

@ -57,7 +57,7 @@ REMOTE_GLOBAL_EXPLORER_DIR = os.path.join(REMOTE_CONF_DIR, "explorer")
CODE_HEADER = "#!/bin/sh -e\n" CODE_HEADER = "#!/bin/sh -e\n"
DOT_CDIST = ".cdist" DOT_CDIST = ".cdist"
TYPE_PREFIX = "__" TYPE_PREFIX = "__"
VERSION = "2.0.0" VERSION = "2.0.1"
logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s') logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s')
log = logging.getLogger() log = logging.getLogger()