Merge branch 'master' of github.com:metamx/druid
diff --git a/server/src/main/java/com/metamx/druid/http/MasterMain.java b/server/src/main/java/com/metamx/druid/http/MasterMain.java
index 32e03e7..5750cc3 100644
--- a/server/src/main/java/com/metamx/druid/http/MasterMain.java
+++ b/server/src/main/java/com/metamx/druid/http/MasterMain.java
@@ -185,8 +185,10 @@
         masterYp
     );
 
+    final ConfigManagerConfig configManagerConfig = configFactory.build(ConfigManagerConfig.class);
+    DbConnector.createConfigTable(dbi, configManagerConfig.getConfigTable());
     JacksonConfigManager configManager = new JacksonConfigManager(
-        new ConfigManager(dbi, configFactory.build(ConfigManagerConfig.class)), jsonMapper
+        new ConfigManager(dbi, configManagerConfig), jsonMapper
     );
 
     final DruidMaster master = new DruidMaster(