1
0
Fork 0
Commit Graph

28221 Commits

Author SHA1 Message Date
Jan Steemann d0296b38e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 18:27:53 +02:00
Jan 7cd428c367 Merge pull request #1798 from ObiWahn/devel
optional velocypack response
2016-04-12 18:27:08 +02:00
Jan Steemann c0fd5c5f78 removal of some JSON 2016-04-12 18:21:11 +02:00
Jan Steemann c49166d40e do not log traces! 2016-04-12 16:37:48 +02:00
Jan Steemann 51bfb8fe57 remove TRI_json_t 2016-04-12 16:37:36 +02:00
Kaveh Vahedipour 1d124b8166 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 16:01:48 +02:00
Kaveh Vahedipour 237b190032 correct callback jsons 2016-04-12 16:01:36 +02:00
Kaveh Vahedipour 9bd08b98c4 correct callback jsons 2016-04-12 16:01:00 +02:00
Wilfried Goesgens d0692b90f0 fix typo 2016-04-12 15:12:36 +02:00
Jan Steemann 0c272978d9 use THROW_ARANGO_EXCEPTION 2016-04-12 15:04:17 +02:00
Jan Steemann f2c8df7db7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 14:51:37 +02:00
Jan Steemann 9163236f2b renamed optimizer rule "merge-traversal-filter" into "optimize-traversals" 2016-04-12 14:51:15 +02:00
Kaveh Vahedipour c2665a63f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 14:20:56 +02:00
Kaveh Vahedipour b44af0ab60 new simple URI form from endpoint 2016-04-12 14:20:47 +02:00
Andreas Streichardt 8354acca0d Merge github.com:arangodb/arangodb into devel 2016-04-12 14:11:22 +02:00
Andreas Streichardt 7b90f3040c parallelize cluster instance startup during test 2016-04-12 14:10:38 +02:00
Kaveh Vahedipour 0efa889f43 new simple URI form from endpoint 2016-04-12 14:10:18 +02:00
Kaveh Vahedipour 7d608b160f introducing cluster sanity checking to agency 2016-04-12 12:56:12 +02:00
Kaveh Vahedipour d80df74071 introducing cluster sanity checking to agency 2016-04-12 12:52:15 +02:00
Kaveh Vahedipour 9853b9662c introducing cluster sanity checking to agency 2016-04-12 12:10:46 +02:00
Kaveh Vahedipour 66636cdb7d introducing cluster sanity checking to agency 2016-04-12 11:35:27 +02:00
Kaveh Vahedipour 9a608f3037 introducing cluster sanity checking to agency 2016-04-12 11:04:37 +02:00
Kaveh Vahedipour b7c2a03558 introducing cluster sanity checking to agency 2016-04-12 10:59:18 +02:00
Kaveh Vahedipour 6dfa9baaf2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 10:26:00 +02:00
Kaveh Vahedipour bf95261493 introducing cluster sanity checking to agency 2016-04-12 10:25:52 +02:00
Max Neunhoeffer c9031a648f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-11 23:39:02 +02:00
Max Neunhoeffer 99de60c6fc First version of synchronous replication for insertLocal. 2016-04-11 23:38:02 +02:00
Max Neunhoeffer a321d417a9 Add performRequests. 2016-04-11 23:37:46 +02:00
jsteemann 25c89bb7e8 make AQL RANGE() function return a real range object 2016-04-11 23:11:05 +02:00
jsteemann 13b27483a0 move construction to initializer list 2016-04-11 23:10:48 +02:00
Jan Steemann a7e2d783ee enable copy elision 2016-04-11 18:05:43 +02:00
Kaveh Vahedipour f02b327827 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-11 17:36:51 +02:00
Kaveh Vahedipour 9ef35839cc TRI_ReleaseDatabaseServer moved to end of beginshutdown 2016-04-11 15:36:02 +00:00
Kaveh Vahedipour 2b4c89cf49 Catching up with highest log entry on leader 2016-04-11 16:59:43 +02:00
Kaveh Vahedipour 125b8ffafb visualstudio fixesush 2016-04-11 16:32:53 +02:00
Kaveh Vahedipour 104725943b visualstudio fixesush 2016-04-11 16:25:35 +02:00
Kaveh Vahedipour 342a4f8113 visualstudio fixes 2016-04-11 15:53:06 +02:00
Kaveh Vahedipour f232a8db86 VisualStudio fixes 2016-04-11 15:11:15 +02:00
Kaveh Vahedipour be6b410a3e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-11 14:55:09 +02:00
Kaveh Vahedipour c3c6dd14d5 clang binaries don't like being left with an undefined iterator. no way around fixing it. 2016-04-11 14:54:46 +02:00
Andreas Streichardt ee304da3c6 Merge github.com:arangodb/arangodb into devel 2016-04-11 14:44:07 +02:00
Andreas Streichardt 7c852126d9 Allow it to work without a complete build 2016-04-11 14:43:18 +02:00
Kaveh Vahedipour acf2699fa2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-11 14:36:58 +02:00
Kaveh Vahedipour 1c64dfccb6 clang binaries don't like being left with an undefined iterator. no way around fixing it. 2016-04-11 14:36:42 +02:00
Wilfried Goesgens 81df4e6e85 migrate 1b41f5c0bb to devel. 2016-04-11 14:21:46 +02:00
Jan Steemann 947fb8d9ad make LIKE wildcards newline-aware 2016-04-11 14:02:12 +02:00
Jan Steemann 7c934b43e9 updated library 2016-04-11 13:27:21 +02:00
Andreas Streichardt f791bbf9aa Fix script 2016-04-11 10:58:15 +02:00
Kaveh Vahedipour 39c1070993 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-11 07:55:36 +00:00
Kaveh Vahedipour 67e705eb77 all internal http calls to agency database on vpack 2016-04-11 07:55:28 +00:00