Merge pull request #2627 from arangodb/feature/jenkins-configuration-files-pointing-to-testing

jenkins configuration files where erroneously pointing to 'testing'
2017-06-21 11:50:18 +02:00 · 2017-06-21 11:50:18 +02:00 · cab85a9999
parent 55f16b0651 52f18966c5
commit cab85a9999
6 changed files with 6 additions and 6 deletions
--- a/etc/jenkins/arangod-agency.conf
+++ b/etc/jenkins/arangod-agency.conf
@ -1 +1 @@
-@include etc/testing/arangod-common.conf
+@include etc/jenkins/arangod-common.conf
--- a/etc/jenkins/arangod-agent.conf
+++ b/etc/jenkins/arangod-agent.conf
@ -1 +1 @@
-@include etc/testing/arangod-common.conf
+@include etc/jenkins/arangod-common.conf
--- a/etc/jenkins/arangod-coordinator.conf
+++ b/etc/jenkins/arangod-coordinator.conf
@ -1,4 +1,4 @@
-@include etc/testing/arangod-common.conf
+@include etc/jenkins/arangod-common.conf
 [log]
 #level = agencycomm=trace
--- a/etc/jenkins/arangod-dbserver.conf
+++ b/etc/jenkins/arangod-dbserver.conf
@ -1,3 +1,3 @@
-@include etc/testing/arangod-common.conf
+@include etc/jenkins/arangod-common.conf
 [log]
 level = replication=trace
--- a/etc/jenkins/arangod-single.conf
+++ b/etc/jenkins/arangod-single.conf
@ -1 +1 @@
-@include etc/testing/arangod-common.conf
+@include etc/jenkins/arangod-common.conf
--- a/etc/jenkins/arangod.conf
+++ b/etc/jenkins/arangod.conf
@ -1 +1 @@
-@include etc/testing/arangod-common.conf
+@include etc/jenkins/arangod-common.conf
`@ -1 +1 @@`
	`@include etc/testing/arangod-common.conf`	`@include etc/jenkins/arangod-common.conf`