1
0
Fork 0
Commit Graph

247 Commits

Author SHA1 Message Date
Jan Steemann 20d5c6b736 added test case "multi-collection" 2014-07-23 15:14:12 +02:00
Jan Steemann 21067e4ff1 TRI_ASSERT 2014-07-02 15:18:51 +02:00
Jan Steemann ca4e59d7ee fixed ugly prompt when no connection to server is requested 2014-07-02 10:36:50 +02:00
Jan Steemann 16bf152c8f fully removed replication logger 2014-06-21 00:32:47 +02:00
Frank Celler 24a5ec0739 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/Ahuacatl/ahuacatl-grammar.cpp
	arangod/Ahuacatl/ahuacatl-grammar.h
2014-06-20 16:42:43 +02:00
Frank Celler 4dcf5dc817 updated disclaimer 2014-06-20 16:40:35 +02:00
Lucas Dohmen 95fb92b195 Move testrunner into the org/arangodb 'namespace' 2014-06-20 16:05:09 +02:00
Jan Steemann 589ff8e208 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 17:26:20 +02:00
Frank Celler f5419205ac added voice 2014-06-18 16:34:55 +02:00
Jan Steemann 30460bb72c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-17 00:49:37 +02:00
Lucas Dohmen b5764513d9 Extracted the test runner from jsunity 2014-06-16 14:39:40 +02:00
Jan Steemann 1b94fbf904 fixed crash in dump 2014-06-13 01:53:44 +02:00
Jan Steemann 86cecdb6a6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
2014-05-26 17:28:16 +02:00
Jan Steemann 017d36bfc2 increased default --batch-size for arangoimp, improved documentation for arangoimp 2014-05-23 18:22:00 +02:00
Max Neunhoeffer ff1dfdd55f Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Jan Steemann cbb78da0bc prevent double freeing 2014-05-17 13:13:19 +02:00
Jan Steemann a8d5bc32b2 fixed memleaks in client tools 2014-05-17 12:49:50 +02:00
Jan Steemann b811d21fad issue #862: added `--overwrite` option for arangoimp 2014-05-16 21:29:20 +02:00
Max Neunhoeffer 3661d9bd93 Use /_admin/server/role instead of /_admin/execute for dump/restore.
This prevents a warning in the logs and is cleaner.
2014-05-16 12:57:42 +02:00
Max Neunhoeffer 9b5f015747 Prepare setup for cluster arangorestore. 2014-05-08 22:38:52 +02:00
Max Neunhoeffer 3973e61608 First cluster dump worked. 2014-05-08 12:42:38 +02:00
Max Neunhoeffer f6bd2bbe91 Start cluster mode for arangodump. Unfinished. 2014-05-07 16:46:41 +02:00
Max Neunhoeffer df68f47338 Use StringBuffer in SimpleHttpResult rather than stringstream. 2014-05-07 16:35:40 +02:00
Frank Celler 990a041bbd added local directory to search path 2014-05-04 21:24:52 +02:00
Jan Steemann 868c2371ab unified error messages 2014-04-23 23:35:59 +02:00
Jan Steemann 0aa7327c2d issue #835: arangosh doesn't show correct database name 2014-04-22 09:12:00 +02:00
Jan Steemann cdce1bb374 fix invalid character display in linenoise 2014-04-11 19:59:29 +02:00
Jan Steemann e5ec69f423 emit server version 2014-03-27 14:19:45 +01:00
Jan Steemann 16f1fc5a93 added --force option, allow using incompatible server version 2014-03-27 14:12:09 +01:00
Frank Celler e25945aaba fixed javascript.execute for coffee-script 2014-03-20 22:51:30 +01:00
Esteban Lombeyda beccde4cd1 Bug fix: too many new lines in arango shell are removed 2014-03-20 11:59:53 +01:00
Esteban Lombeyda 542cca7dc5 support of utf-8 output for windows 2014-03-19 13:10:54 +01:00
Jan Steemann 784c54718c fixed return value of `make jslint` 2014-03-10 09:28:43 +01:00
Jan Steemann abd11203c3 fixed version expectation 2014-02-28 10:26:43 +01:00
Jan Steemann 217256ca2e use change from devel branch 2014-02-27 20:11:45 +01:00
Jan Steemann 4de0014ed3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 10:51:20 +01:00
Jan Steemann 1209298476 fixed client tests 2014-02-27 10:49:29 +01:00
Jan Steemann 3d5149b022 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangosh/V8Client/arangosh.cpp
2014-02-26 21:34:34 +01:00
Jan Steemann cfae17c667 make SYS_UNIT_TESTS_RESULT writeable 2014-02-26 13:36:01 +01:00
Jan Steemann 0ac7ddaaf9 fix shell client test results 2014-02-25 15:43:57 +01:00
Jan Steemann 7f236650ff fix database name in prompt 2014-02-24 14:46:58 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
2014-02-18 08:50:27 +01:00
Frank Celler 73f2be8a33 removed check-server 2014-02-15 23:34:24 +01:00
Jan Steemann 5270f994c9 Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	js/apps/system/aardvark/frontend/css/layout.css
	js/server/modules/org/arangodb/arango-collection.js
2014-02-12 12:53:08 +01:00
Jan Steemann 859dd2a9d8 better handling of --javascript.package-path 2014-02-12 09:59:23 +01:00
Michael Hackstein bc16cfae86 Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	Documentation/InstallationManual/Installing.md
	arangosh/CMakeLists.txt
2014-02-11 15:52:49 +01:00
Frank Celler c6ce5c7406 made module loader more node compatible, added coffee script support 2014-02-11 13:26:11 +01:00
Jan Steemann 83b0cd8e5b fixed segfault 2014-01-30 18:46:34 +01:00
Jan Steemann 2ced0f6a21 fixed terminal reset 2014-01-27 16:54:48 +01:00