1
0
Fork 0
Commit Graph

165 Commits

Author SHA1 Message Date
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Andreas Streichardt c2914ae521 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 17:41:49 +02:00
Andreas Streichardt 1743f2eb49 num v8 context 1 in agency to save memory 2016-04-19 17:41:24 +02:00
Michael Hackstein 1eb1e0ee0c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 17:08:21 +02:00
Michael Hackstein 7455347263 Start Local cluster will now fail if upgrading and bootstrapping fails 2016-04-19 17:08:16 +02:00
Andreas Streichardt f41d9c41c4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 16:50:36 +02:00
Andreas Streichardt 30b71d0423 Wait 5ms when connection needs to be reestablished 2016-04-19 16:49:51 +02:00
Max Neunhoeffer f3e47db5d8 Add a dumpAgency script. 2016-04-19 14:51:17 +02:00
Max Neunhoeffer 65e66b92a7 Add startAgency script. 2016-04-19 14:43:53 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
2016-04-19 07:44:00 +02:00
Alan Plum 926f02ace5
Use mime-types 2016-04-18 18:00:35 +02:00
Frank Celler 9d26ab1bbc WIP 2016-04-16 17:39:20 -07:00
Andreas Streichardt 49d0407859 Trace vs info again 2016-04-14 18:23:08 +02:00
Andreas Streichardt 612c387c56 Optimize version increase stuff 2016-04-14 18:17:25 +02:00
Kaveh Vahedipour fa6e12efe4 option to turn off sync for wait on every persistence call 2016-04-13 19:40:19 +02:00
Kaveh Vahedipour d247e7a3bd mop is fixing the cluster load 2016-04-13 15:36:11 +02:00
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
Jan Steemann c49166d40e do not log traces! 2016-04-12 16:37:48 +02:00
Jan Steemann b366366ba9 fixed startup configuration 2016-04-07 09:09:26 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Andreas Streichardt c2cf4be4e0 Remove etcd 2016-04-05 18:41:37 +02:00
Andreas Streichardt d2d7af67fe Kickstarter and planner are dead 2016-04-05 17:45:39 +02:00
Andreas Streichardt 70d6f1259a Finally cluster is working with the new agency 2016-04-01 17:07:28 +02:00
Andreas Streichardt b2fc192dd2 implement new agency 2016-03-31 14:03:01 +02:00
Jan Steemann 881761d2d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 17:05:43 +01:00
Andreas Streichardt 9ba72b4412 Properly update current collection 2016-03-24 16:55:15 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Andreas Streichardt 8cdf8eebad More python fixes 2016-03-23 18:36:22 +01:00
Max Neunhoeffer 55998ba0a9 Add rr support for startLocalCluster. 2016-03-23 08:57:23 +01:00
Andreas Streichardt b2334b8406 Starting up secondaries works 2016-03-17 10:38:47 +00:00
Frank Celler d9f9b8b65d fixed server version 2016-03-16 13:01:18 +01:00
Frank Celler aede7c5eb1 removed arangod from document path 2016-03-16 12:30:09 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Frank Celler da7955e417 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-24 19:29:01 +01:00
Andreas Streichardt c69696bc85 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-24 17:01:12 +01:00
Max Neunhoeffer 15865ccae4 Fix startLocalCluster script? 2016-02-24 16:56:50 +01:00
Frank Celler 9fca3425a1 cleanup 2016-02-23 15:28:31 +01:00
Andreas Streichardt 840705f85e custom data dir 2016-02-23 15:25:04 +01:00
Andreas Streichardt e8d3bf0f7b cmake build locations vs. startLocalCluster 2016-02-23 15:25:04 +01:00
Andreas Streichardt 2c65416f3d one cluster dir is enough...log agency stuff 2016-02-22 18:26:54 +01:00
Andreas Streichardt c9bb0f1eeb custom data dir 2016-02-22 18:15:02 +01:00
Andreas Streichardt 025bb3da51 cmake build locations vs. startLocalCluster 2016-02-22 17:36:45 +01:00
Frank Celler c0f5fbe453 use ARANGOSH is given 2016-02-20 12:01:31 +01:00
Kaveh Vahedipour db9d23b7ef Adapting to intel compiler 15.0 2016-02-18 23:26:45 +01:00
Frank Celler 226e51b72b changed binary path to new cmake structure 2016-02-18 15:16:51 +01:00
Max Neunhoeffer cf763f6eb0 Make terminal a bit smaller in debugging mode. 2016-02-17 08:36:57 +01:00
Max Neunhoeffer 459a540867 Merge branch 'devel' into ClustUp2 2016-02-15 09:16:01 +01:00
Frank Celler 6ac522f9ea added jslint script 2016-02-14 16:50:41 +01:00
Max Neunhoeffer 1065486a77 First version of getting shards in sync working. 2016-02-13 23:04:20 +01:00
Wilfried Goesgens 35eee05537 lintify 2016-02-10 16:21:30 +01:00