merge all changes from private git 12.234.32.41 to public git compass-core. Fix all broken tests caused by the code change.

Change-Id: I6b629d5cdb4ddf3a1a3eedb08fae37501e51ed09
This commit is contained in:
Xiaodong Wang
2014-01-24 22:01:36 -08:00
committed by xiaodongwang
parent 97698042df
commit 16ebf00865
25 changed files with 1957 additions and 142 deletions

View File

@@ -9,6 +9,7 @@ else:
SETTING = '/etc/compass/setting'
try:
print 'load setting from %s' % SETTING
execfile(SETTING, globals(), locals())
except Exception as error:
logging.exception(error)