8000 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel · sleepycat/arangodb@e256b11 · GitHub
[go: up one dir, main page]
Skip to content

Commit e256b11

Browse files
jsteemannjsteemann
committed
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2 parents 0156c5a + 1053897 commit e256b11

15 files changed

+98
-24
lines changed

‎etc/jenkins/arango-dfdb.conf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
[database]
2+
auto-upgrade = false
3+
upgrade-check = false
4+
5+
[server]
6+
rest-server = false
7+
authentication = false
8+
# username = root
9+
# password =
10+
11+
statistics = false
12+
# set number of threads to 1 so we don't have concurrency
13+
threads = 1
14+
15+
[javascript]
16+
startup-directory = ./js
17+
app-path = ./js/apps
18+
script = ./js/server/arango-dfdb.js
19+
v8-contexts = 1
20+
21+
[foxx]
22+
queues = false
23+
24+
[log]
25+
level = info

‎etc/jenkins/arangobench.conf

Whitespace-only changes.

‎etc/jenkins/arangod-agency.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@include etc/testing/arangod-common.conf

‎etc/jenkins/arangod-agent.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@include etc/testing/arangod-common.conf

‎etc/jenkins/arangod-common.conf

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[log]
2+
force-direct = true
3+
level = info
4+
level = replication=warn
5+
6+
[database]
7+
force-sync-properties = false
8+
maximal-journal-size = 1048576
9+
10+
[javascript]
11+
startup-directory = @TOP_DIR@/js
12+
module-directory = @TOP_DIR@/enterprise/js
13+
v8-contexts = 5
14+
15+
[server]
16+
allow-use-database = true
17+
authentication = false
18+
threads = 20
19+
20+
[ssl]
21+
keyfile = @TOP_DIR@/UnitTests/server.pem

‎etc/jenkins/arangod-coordinator.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@include etc/testing/arangod-common.conf
2+
3+
[log]
4+
#level = agencycomm=trace

‎etc/jenkins/arangod-dbserver.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@include etc/testing/arangod-common.conf

‎etc/jenkins/arangod-single.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@include etc/testing/arangod-common.conf

‎etc/jenkins/arangod.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@include etc/testing/arangod-common.conf

‎etc/jenkins/arangodump.conf

Whitespace-only changes.

0 commit comments

Comments
 (0)
0