1
0
Fork 0
Commit Graph

11096 Commits

Author SHA1 Message Date
hkernbach 3284020fb9 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 11:38:47 +02:00
Max Neunhoeffer e3abdeb73c Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-09 11:16:30 +02:00
Max Neunhoeffer d48342d3b5 Change sleep to wait. 2016-05-09 11:16:16 +02:00
Michael Hackstein 914bb6c93e Fixed JSLint 2016-05-09 11:03:30 +02:00
hkernbach afff208abe Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 10:26:02 +02:00
Michael Hackstein a24fc0757d Added some more tests for wired AQL append input parameters. 2016-05-09 09:57:56 +02:00
Michael Hackstein 6f4a65d7a6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 09:39:33 +02:00
Michael Hackstein 8dd27b01f8 Added an Index and an AQL statement to the quickie test. 2016-05-09 09:39:23 +02:00
Kaveh Vahedipour c8dca04054 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-09 08:58:39 +02:00
Kaveh Vahedipour 220c286a11 agency compaction to c++ database api 2016-05-09 08:12:22 +02:00
jsteemann e1f874ad4a jslint 2016-05-07 07:56:16 +02:00
Max Neunhoeffer b5c87fba33 Add a trivial quickie test and a convenience script. 2016-05-06 22:47:17 +02:00
Andreas Streichardt 9cbf7aae33 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-06 19:12:30 +02:00
Jan Steemann 0bd61cf928 removed option `--server.default-api-compatibility` 2016-05-06 18:38:37 +02:00
Jan Steemann b2171e425d removed unused functions 2016-05-06 17:59:06 +02:00
Andreas Streichardt 9cbe13dd43 Merge branch 'json_agency_comm' into devel 2016-05-06 17:21:41 +02:00
Andreas Streichardt 3773b0e66c Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-06 17:04:04 +02:00
Andreas Streichardt 04ba5156e5 Rework planned collection loading 2016-05-06 17:03:13 +02:00
hkernbach fcff0d9a20 scss 2016-05-06 15:32:58 +02:00
hkernbach 66909b7ad8 login view 2016-05-06 15:32:42 +02:00
Jan Steemann 838e3dc866 fixed handling of externals in some cases 2016-05-06 11:52:06 +02:00
Max Neunhoeffer 5690c0410c Remove option replicationQuorum which was unused as of now. 2016-05-06 09:53:01 +02:00
hkernbach 11f418ff80 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-06 08:43:11 +02:00
Kaveh Vahedipour 35d604e9e0 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 18:17:00 +02:00
Michael Hackstein 262ff9b75e Added a test for intersection with documents directly out of the database. 2016-05-04 17:32:13 +02:00
Kaveh Vahedipour e623198d6c Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 17:06:23 +02:00
Michael Hackstein 62f2d55c20 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-04 16:46:13 +02:00
Michael Hackstein 4f674220ab Added brute force tests in AQL functions. 2016-05-04 16:45:59 +02:00
Michael Hackstein ca836216fc Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-04 16:38:16 +02:00
jsteemann bb4b1b8b88 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-04 16:20:28 +02:00
jsteemann f2d014ff6a bugfixes 2016-05-04 16:10:04 +02:00
Michael Hackstein 04753a9131 Improved type checking of options in a graph function. 2016-05-04 15:54:16 +02:00
Wilfried Goesgens a9e6665b8a Adjust config db dir in test for the new way of having it named arangodb3 2016-05-04 15:28:49 +02:00
Max Neunhoeffer f0db06b47d Fix test and jslint. 2016-05-04 14:50:37 +02:00
Alan Plum b11af7f6a4
Make scss-lint happy
I guess? Maybe? This is what you want, isn't it?
2016-05-04 13:57:02 +02:00
Alan Plum 1b638c1abf
Update graphql-sync
skip ci
2016-05-04 12:51:12 +02:00
Alan Plum 7e2603bdcc Merge pull request #1811 from arangodb/kill-the-monkey
Remove monkeypatches
2016-05-04 11:42:24 +02:00
Max Neunhoeffer eeb597fc85 Fix a test. 2016-05-04 11:37:55 +02:00
Max Neunhoeffer 0ac60a8fe7 Merge branch 'devel' into json_agency_comm 2016-05-04 11:15:02 +02:00
Max Neunhoeffer 1b0b9ae5df Take out getTargetServerEndpoint.
This used Target/MapIDToEndpoint which is now gone.
2016-05-04 11:10:42 +02:00
Michael Hackstein aab91d51e6 Fixed JSLint 2016-05-04 10:40:06 +02:00
Michael Hackstein c8cdb5ab93 Added a test for large overlapping ranges in skiplists. This covers a bug where unification of results lead to early lookup abortion. 2016-05-04 10:17:29 +02:00
hkernbach 6d5b29ca70 dashboard bugfix 2016-05-03 17:57:53 +02:00
hkernbach 7572db543e scss lint 2016-05-03 17:53:40 +02:00
hkernbach 0365e685d4 grunt build 2016-05-03 17:52:11 +02:00
hkernbach 9fa6736e5e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-03 17:47:00 +02:00
hkernbach 3114021f93 changed aardvark login mechanism 2016-05-03 17:46:51 +02:00
Wilfried Goesgens d944140edf Unify crash handling between alive & shutdown checks. 2016-05-03 17:41:33 +02:00
Frank Celler ec2418c500 added testBuckets 2016-05-03 16:45:28 +02:00
Wilfried Goesgens 18c04a0e20 Make calling of executable fail if true is passed in. 2016-05-03 16:24:05 +02:00