change branch to master

samuelololol · Aug 17, 2015 · 7ea6257 · 7ea6257
1 parent ed53c88
commit 7ea6257
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/docker-buildbot/ubuntu-buildbot-master/buildbotdocker.py b/docker-buildbot/ubuntu-buildbot-master/buildbotdocker.py
@@ -23,7 +23,8 @@
 
 BUILDBOT_MASTER_PROTOCOL_PORT = 9989
 
-BUILDBOT_GITPOLLER_BRANCH = "simplify_master_cfg"
+#BUILDBOT_GITPOLLER_BRANCH = "simplify_master_cfg"
+BUILDBOT_GITPOLLER_BRANCH = "master"
 BUILDBOT_GITPOLLER_BRANCHES = None
 
 BUILDBOT_MASTER_PORT = 8010

diff --git a/docker-buildbot/ubuntu-buildbot-slave/buildbotdocker.py b/docker-buildbot/ubuntu-buildbot-slave/buildbotdocker.py
@@ -23,7 +23,8 @@
 
 BUILDBOT_MASTER_PROTOCOL_PORT = 9989
 
-BUILDBOT_GITPOLLER_BRANCH = "simplify_master_cfg"
+#BUILDBOT_GITPOLLER_BRANCH = "simplify_master_cfg"
+BUILDBOT_GITPOLLER_BRANCH = "master"
 BUILDBOT_GITPOLLER_BRANCHES = None
 
 BUILDBOT_MASTER_PORT = 8010

diff --git a/docker-test/ubuntu-buildbot-master/buildbotdocker.py b/docker-test/ubuntu-buildbot-master/buildbotdocker.py
@@ -23,7 +23,8 @@
 
 BUILDBOT_MASTER_PROTOCOL_PORT = 9989
 
-BUILDBOT_GITPOLLER_BRANCH = "simplify_master_cfg"
+#BUILDBOT_GITPOLLER_BRANCH = "simplify_master_cfg"
+BUILDBOT_GITPOLLER_BRANCH = "master"
 BUILDBOT_GITPOLLER_BRANCHES = None
 
 BUILDBOT_MASTER_PORT = 8010

diff --git a/docker-test/ubuntu-buildbot-slave/buildbotdocker.py b/docker-test/ubuntu-buildbot-slave/buildbotdocker.py
@@ -23,7 +23,8 @@
 
 BUILDBOT_MASTER_PROTOCOL_PORT = 9989
 
-BUILDBOT_GITPOLLER_BRANCH = "simplify_master_cfg"
+#BUILDBOT_GITPOLLER_BRANCH = "simplify_master_cfg"
+BUILDBOT_GITPOLLER_BRANCH = "master"
 BUILDBOT_GITPOLLER_BRANCHES = None
 
 BUILDBOT_MASTER_PORT = 8010