Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,618 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

1589 Commits

Author SHA1 Message Date
Jan Steemann 7d28a03782 added AQL date functions 2014-05-07 18:17:46 +02:00
scottashton 169ca7589e fixed healthcheck 2014-05-07 11:12:37 +02:00
Max Neunhoeffer ad5db2a380 Use cluster auth for shutdown. 2014-05-06 13:02:38 +02:00
Max Neunhoeffer 7b44869eb3 Fix kickstarter process startup and shutdown. 2014-05-06 11:44:25 +02:00
Jan Steemann 8f821d62fe prevent AQL query from failing 2014-05-05 21:50:15 +02:00
Jan Steemann b978a271ea added AQL function `CURRENT_DATABASE()` 2014-05-02 22:06:47 +02:00
Jan Steemann 02a532a122 added CURRENT_USER function for AQL 2014-05-02 12:00:39 +02:00
Jan Steemann 18302b3ab4 do not segfault on cancellation 2014-04-25 12:45:31 +02:00
Jan Steemann 0cb2217518 no need to run the GC after each and every request during testing 
this change will hopefully make tests run a bit faster
 2014-04-23 23:22:49 +02:00
Jan Steemann a4ee394d4b fixed AQL return codes in the face of cancellation 2014-04-23 19:07:34 +02:00
Jan Steemann 3744e8dde9 issue #796: Searching with newline chars broken? 2014-04-22 13:38:06 +02:00
Jan Steemann 4075f08aef silence foxx manager 2014-04-22 12:13:53 +02:00
Jan Steemann 76c09f43b5 added tests 2014-04-22 11:31:35 +02:00
gschwab ca984e1212 added 'passwordToken' to create user, fixed small bug with changePassword attribute 2014-04-17 13:27:02 +02:00
Frank Celler 39fd596abc changed return of users.remove 
Conflicts:
	js/actions/api-user.js
 2014-04-16 19:56:04 +02:00
Jan Steemann 2050049b06 added periodic job management 
this adds functions internal.deletePeriod() and internal.getPeriodic()
functions internal.definePeriodic() now also has an extra parameter to
specify the name of a periodic job. this makes it more easy to tell
jobs apart in the result of internal.getPeriodic().
 2014-04-13 22:19:46 +02:00
Frank Celler 22ad916024 added configuration module, documentation is not there yet 2014-04-13 14:20:09 +02:00
Frank Celler 8464018141 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-13 14:18:33 +02:00
Jan Steemann 2c030d0119 autoload modules 2014-04-11 18:43:14 +02:00
Frank Celler e30414b839 fixed path 2014-04-10 17:32:08 +02:00
gschwab 68be5db03b added foxx app to change initial password 2014-04-10 17:31:44 +02:00
Frank Celler 99bc134bcf added password token functions 2014-04-10 17:31:33 +02:00
Jan Steemann ba8e38d6e5 bugfix for AQL query optimiser 
the following type of query was too eagerly optimised, leading to errors in code-generation:

   LET a = (FOR i IN [] RETURN i) LET b = (FOR i IN [] RETURN i) RETURN 1

the problem occurred when both lists in the subqueries were empty. In this case invalid code
was generated and the query couldn't be executed.
 2014-04-08 23:26:55 +02:00
Jan Steemann ad64c52e28 issue #796: fixed potential issue with newlines treated slightly differently in different parts of AQL 2014-04-08 13:20:26 +02:00
Jan Steemann 88c3089b36 don't report bogus error messages 2014-04-02 17:51:25 +02:00
Jan Steemann 7eeba86254 update routing cache all or nothing 2014-04-02 16:29:42 +02:00
Michael Hackstein 7549c13bc5 Created a simple change password implementation for foxx. Added Documentation 2014-04-01 17:23:09 +02:00
Jan Steemann e2f1d0dfb6 fixed issues in arango-dfdb 2014-03-27 12:29:32 +01:00
Frank Celler d34832bbcf added changePassword attribute for users 2014-03-25 11:40:13 +01:00
Frank Celler 11fb42e722 removed SYS_TEST_PORT from global namespace 2014-03-20 23:05:17 +01:00
Jan Steemann 0ac6928e0f prevent `body length: -9223372036854775808` being printed 2014-03-20 20:45:06 +01:00
Frank Celler e3df90d2c3 coffee script fix 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-03-20 19:36:42 +01:00
Jan Steemann 1b69e337a6 fixed datafiles issues 2014-03-14 13:25:15 +01:00
Michael Hackstein f7a85aa079 Fixed Cluster Agency Communication Tests 2014-03-14 10:54:26 +01:00
Max Neunhoeffer 2a0e487520 Improve error reporting. 2014-03-14 10:33:22 +01:00
Jan Steemann ec75cbe11a transactionally query installed apps so prevent race conditions in case of parallel de-installation of apps 2014-03-13 21:50:19 +01:00
Jan Steemann 9b0bb25cc5 don't requeue identical global context methods 2014-03-13 21:48:27 +01:00
Jan Steemann ef45f43be9 fixed arango-dfdb issues 2014-03-13 20:56:45 +01:00
Max Neunhoeffer 51ab7bbb9b Skip dump and import tests on the cluster because they cannot work. 2014-03-13 13:38:19 +01:00
Max Neunhoeffer d84fd0a37f Really deactivate a test that cannot work on the cluster. 2014-03-13 13:35:43 +01:00
Max Neunhoeffer 0d3b1eccb4 Do not remove logs directory after ruby tests. 2014-03-13 09:51:46 +01:00
Jan Steemann 0dfac28f71 jslint 2014-03-12 17:54:28 +01:00
Max Neunhoeffer 9e42ec4409 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-12 16:21:38 +01:00
Max Neunhoeffer 77296e3a84 Enable SSL on cluster. 2014-03-12 16:21:19 +01:00
Jan Steemann babaf2738b adjusted tests 2014-03-12 14:19:13 +01:00
Jan Steemann 35cf13a38c more tests for shapes 2014-03-12 13:26:09 +01:00
Max Neunhoeffer a70c082a0d Quote a string correctly for Windows. 2014-03-11 09:32:57 +01:00
Frank Celler 1d9c133bf9 fixed warning 2014-03-10 19:24:06 +01:00
Max Neunhoeffer 24e7293dba Split shell-any tests to save time on the cluster. 2014-03-10 10:21:28 +01:00
Max Neunhoeffer 6206f91d56 Yet another fix for process shutdown on Unix. 2014-03-07 16:20:12 +01:00
Max Neunhoeffer 101486c6af Improve error handling in process startup in js testing framework. 2014-03-07 15:01:50 +01:00
Max Neunhoeffer 79ac8949dd Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-07 11:37:31 +01:00
Max Neunhoeffer 9d43383f1d Fix automatic reload of user config on coordinators. 2014-03-07 11:37:16 +01:00
Jan Steemann ae202acb5c assign an id to the system database, too 2014-03-07 10:23:17 +01:00
Frank Celler baa68e0958 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-06 17:38:23 +01:00
Frank Celler 15e1fbbb0d replaced meier by arango 2014-03-06 17:38:18 +01:00
Max Neunhoeffer 3c198365fc Do not run version-check.js at relaunch. 
Rationale: We cannot possibly know the right authentication
because the owner of the cluster might have changed the password.
Also, it is not necessary to run the script.
 2014-03-06 16:39:30 +01:00
Jan Steemann e1a190a51d fixed segfault during test on Windows 2014-03-04 16:58:22 +01:00
Max Neunhoeffer ef474bde11 Quote string in server tests for Windows backslashes. 2014-03-04 16:21:30 +01:00
scottashton 44ab5d1398 new method admin/history to fetch the statistics history for single arango, coordinator and dbserv 2014-03-04 12:05:00 +01:00
Jan Steemann 8815dfe288 jslint 2014-03-04 08:38:43 +01:00
Jan Steemann a3db6e7fc8 print error if user cannot be added 2014-03-03 09:46:04 +01:00
Jan Steemann cfc0ebf904 fixed jslint warnings 2014-03-03 08:51:17 +01:00
Frank Celler cff606d6ab Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-03-01 16:14:43 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Michael Hackstein 799f443b2f Heartbeats are now interpreted the new way 2014-03-01 14:07:58 +01:00
Michael Hackstein af9541edbc Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 23:20:08 +01:00
Michael Hackstein 017c15638e Fixed all routes for the geraffelige dashboard reload in cluster 2014-02-28 23:19:57 +01:00
Max Neunhoeffer a264b55f32 Fight zombies. 2014-02-28 20:24:42 +01:00
Jan Steemann 3ca2001c99 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 18:43:36 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Max Neunhoeffer b156e93293 Take out 2 tests involving transactions of cluster tests. 2014-02-28 18:01:04 +01:00
Max Neunhoeffer 7544adcc8d Fix JS testing framework with new path setup. 2014-02-28 15:38:25 +01:00
Max Neunhoeffer f3095dbaf7 Servers in cluster are not themselves dispatchers. 2014-02-28 15:10:42 +01:00
Max Neunhoeffer 9939b46a16 Disable dispatcher on servers in cluster. 2014-02-28 14:56:28 +01:00
Max Neunhoeffer c358c677b0 Fix typo. 2014-02-28 14:43:35 +01:00
Max Neunhoeffer 0a8555fab3 Sort out path to javascript files. 2014-02-28 14:19:04 +01:00
Jan Steemann 4615310e97 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 13:50:56 +01:00
Jan Steemann fd08bb0feb use indexes in AQL 2014-02-28 13:50:39 +01:00
Max Neunhoeffer 0dec16279c Fix missing require for base64Encode. 2014-02-28 13:17:32 +01:00
Max Neunhoeffer c342713481 Create logPath directory in kickstarter if not already there. 2014-02-28 12:28:05 +01:00
Max Neunhoeffer eb62ca7f54 Fix name. 2014-02-28 12:19:19 +01:00
Max Neunhoeffer d201cdbd03 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 12:16:13 +01:00
Max Neunhoeffer 454f86ef01 New setup of paths on cluster kickstarter. 2014-02-28 12:15:31 +01:00
Michael Hackstein 543a65a5e0 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 12:09:20 +01:00
Michael Hackstein 352ccf903f Fixed js error in kickstarter 2014-02-28 12:09:08 +01:00
Frank Celler f22f1525d2 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	etc/relative/arangod.conf
 2014-02-28 12:03:11 +01:00
Frank Celler 9a410a5b71 added config for server state 2014-02-28 12:02:21 +01:00
Max Neunhoeffer 0ede95adb8 Hand on authorization information to other dispatchers. 2014-02-28 11:49:43 +01:00
Max Neunhoeffer 05055f3d5d Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 11:41:01 +01:00
Jan Steemann c4cfe7a2ea fixed AQL geo queries 2014-02-28 10:26:31 +01:00
Max Neunhoeffer 10aec4ec4d Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 10:00:14 +01:00
Jan Steemann e505a99a4e fixed fulltext query 2014-02-28 09:56:44 +01:00
Max Neunhoeffer b61dfa3c12 Cleanup results of launch and friends in kickstarter. 
Add allowAgents option for dispatchers.
 2014-02-28 09:31:16 +01:00
Jan Steemann e9c6f17594 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 17:45:31 +01:00
Jan Steemann 897d6f4dcd fixed cluster authentication 2014-02-27 17:45:03 +01:00
Max Neunhoeffer 2ca78ea168 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-27 16:21:28 +01:00
Max Neunhoeffer a0e187cc29 Finish sharding chapter in user documentation. 2014-02-27 16:20:53 +01:00
Jan Steemann ed43b0cce9 jslint 2014-02-27 14:58:53 +01:00
Jan Steemann 242b31a1ab Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 14:21:03 +01:00
Jan Steemann 4bab2cbf35 fixed queries 2014-02-27 14:20:57 +01:00
Michael Hackstein 7ed4f7c602 Added foxx routes for cluster and dispatchers, they are now cluster resp. dispatcher only 2014-02-27 14:13:13 +01:00
Max Neunhoeffer 8659f0569e Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-27 13:55:02 +01:00
Max Neunhoeffer 4c495ae297 Only use one agent ==> incredible speedup. 2014-02-27 13:54:41 +01:00
Frank Celler ce3f8ba45b added dispatcherDisabled check 2014-02-27 13:32:06 +01:00
Max Neunhoeffer 37908e7c00 Please jshund. 2014-02-27 11:59:40 +01:00
Max Neunhoeffer 74eb4ed39c Fix isHealthy check. 2014-02-27 11:49:45 +01:00
Max Neunhoeffer a1614f759c Take out etcd steroids. 2014-02-27 11:41:33 +01:00
Max Neunhoeffer 0009020e5d Rename etcd executable to etcd-arango 2014-02-27 11:40:37 +01:00
Max Neunhoeffer 135f9b26ac Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-27 09:20:40 +01:00
Frank Celler e10bab8059 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 09:16:02 +01:00
Frank Celler 8406f51435 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Ahuacatl/ahuacatl-codegen.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph/traversal.js
	js/common/modules/org/arangodb/graph/traversal.js
	js/server/modules/org/arangodb/ahuacatl.js
	lib/HttpServer/HttpCommTask.h
 2014-02-27 09:13:03 +01:00
Max Neunhoeffer 64558d76e0 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-27 09:00:41 +01:00
Max Neunhoeffer 893e7a87b1 Adjust READMEs to reality. 2014-02-27 08:53:21 +01:00
Frank Celler bc56d26ea3 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 08:52:27 +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 f5269fa3de fixed traversals 2014-02-26 21:28:40 +01:00
Jan Steemann 8e44bc80a5 return error if etcd binary is not present 2014-02-26 20:24:20 +01:00
Frank Celler 4a4fcfd72f Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-26 16:38:47 +01:00
Frank Celler e58c0d00d6 be tolerant 2014-02-26 16:38:39 +01:00
Max Neunhoeffer 89761d5c7e Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-26 14:39:20 +01:00
Max Neunhoeffer bacfafea7f Rename non-cluster tests. 2014-02-26 14:38:55 +01:00
Jan Steemann 2db3d4b42d fixed tests 2014-02-26 14:35:14 +01:00
Max Neunhoeffer d09da8789e Slightly change naming convention for tests. 2014-02-26 14:28:16 +01:00
Jan Steemann 42465ce876 properly return collection status 2014-02-26 14:23:06 +01:00
Jan Steemann bb0f87cfdc fixed bug in Graph.pathTo 2014-02-26 13:40:08 +01:00
Jan Steemann 276a3cf3a1 added SHORTEST_PATH AQL function, fixed bug in Graph.pathTo 2014-02-26 13:34:42 +01:00
Max Neunhoeffer 26c8e03272 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-26 11:48:21 +01:00
Max Neunhoeffer 45c4ae13ec Load collection when truncated. 2014-02-26 11:47:41 +01:00
Jan Steemann 610df5ce35 allow empty examples 2014-02-26 11:22:49 +01:00
Max Neunhoeffer 86faf20dbb Disable transactions server test on cluster. 2014-02-26 10:17:05 +01:00
Max Neunhoeffer ff43f0601b Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-26 08:41:28 +01:00
Jan Steemann 98ceb07b77 add initial user 2014-02-25 17:05:02 +01:00
Max Neunhoeffer af02a45e45 Disable test on cluster. 2014-02-25 16:16:33 +01:00
Frank Celler 3c5f3a656b Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 15:32:12 +01:00
Frank Celler f2121ff442 cleanup 2014-02-25 15:32:07 +01:00
Jan Steemann 0d57a95d52 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 14:08:08 +01:00
Jan Steemann e1f3b6f2d4 react on empty shard lists 2014-02-25 14:08:00 +01:00
Max Neunhoeffer 5f15e04edc Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-25 12:46:33 +01:00
Frank Celler 569778ae10 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 12:07:46 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +01:00
Jan Steemann 8fe19fa897 fixed index tests 2014-02-25 11:55:39 +01:00
Max Neunhoeffer f3d12fdd35 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-25 11:35:21 +01:00
Max Neunhoeffer 799eb7c854 Fix tests on cluster. 2014-02-25 11:35:12 +01:00
Jan Steemann d9c96a91f7 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 11:20:02 +01:00
Jan Steemann af96607fc1 fixed index tests 2014-02-25 11:19:51 +01:00
Max Neunhoeffer 81447c9426 Deactivate a test for the cluster. 2014-02-25 09:56:01 +01:00
Michael Hackstein 0538a0ef5b The cluster overview now displays information about servers that have either not registered or have been shutteddown normally. 2014-02-24 17:32:13 +01:00
Max Neunhoeffer a0a78a0544 Run cluster unittests in a separate data dir. 2014-02-24 15:59:49 +01:00
Max Neunhoeffer 5a37b46cab Improve error reporting of "single" test target. 2014-02-24 14:59:12 +01:00
Max Neunhoeffer baa6e4fba3 Rename to exclude from standard unittests. 2014-02-24 11:02:30 +01:00
Max Neunhoeffer 7400214d9b Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-24 09:02:45 +01:00
Max Neunhoeffer 078f18138d Fix a filename from a renaming operation. 2014-02-22 23:55:22 +01:00
Frank Celler 9680f48c5b added better error reporting 2014-02-22 13:00:26 +01:00
Frank Celler 832254b7b7 fixed graph again 2014-02-21 23:12:37 +01:00
Michael Hackstein 9dda1559bb Some css fixes 2014-02-21 21:24:05 +01:00
Michael Hackstein f71ede2d17 Added a view for the shard distribution 2014-02-21 17:04:19 +01:00
Max Neunhoeffer 25e4ac19ed Nicer print of pid. 2014-02-21 16:04:45 +01:00
Max Neunhoeffer db91b06f7b Sort out logs directory in http/ssl server tests. 2014-02-21 14:21:56 +01:00
Max Neunhoeffer b4bd5ce665 Improve logging. 2014-02-21 13:38:33 +01:00
Max Neunhoeffer 91db141ea5 Change value of things in agency according to Sharding.md. 2014-02-21 13:19:57 +01:00
Max Neunhoeffer 76077f84e7 Report overall test result. 2014-02-21 12:44:31 +01:00
Max Neunhoeffer 3cb1784430 Reorganise unit tests. 
In JS framework we now find the available test files by directory
listing. This means one can simply drop a file in the right
directory to add a test.

We use a naming convention for filenames which is explained
in the README files in the corresponding directories.

Old unit tests do not yet use this but do use the new names and
should still work as usual.
 2014-02-21 11:24:31 +01:00
Max Neunhoeffer 019bb7716f Add authentication tests to js framework. 2014-02-21 10:09:50 +01:00
Jan Steemann 2c1743a732 append port 2014-02-21 10:05:40 +01:00
Frank Celler b248911c79 fixed reget of existing graphs 2014-02-20 23:02:38 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
 2014-02-20 21:02:07 +01:00
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Max Neunhoeffer 3353245e34 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-20 16:20:33 +01:00
Max Neunhoeffer 59699a50af Start to add arangob tests to js framework. 2014-02-20 16:20:19 +01:00
Jan Steemann 4654451fee Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-20 15:51:57 +01:00
Jan Steemann c5aedc0dbc fixed race condition on server start 2014-02-20 15:51:16 +01:00
Max Neunhoeffer 0bf2dcd17c Add foxx_manager unit test to js framework. 2014-02-20 14:49:48 +01:00
Max Neunhoeffer aeaffb5fad Add upgrade unit test to js framework. 2014-02-20 14:33:50 +01:00
Max Neunhoeffer f0dacea7a3 Please jslint. 2014-02-20 14:13:38 +01:00
Max Neunhoeffer 57813e9e32 Add import unit test to js framework. 2014-02-20 14:10:35 +01:00
Max Neunhoeffer 96c6298a1c Please jslint. 2014-02-20 12:54:03 +01:00
Max Neunhoeffer d2538cefeb Add http_server and ssl_server tests to js framework. 2014-02-20 12:52:03 +01:00
Jan Steemann f8980f94a5 initialise foxx on startup 2014-02-20 09:22:39 +01:00
Jan Steemann 82d84e92dd more sleeping 2014-02-19 18:33:11 +01:00
Jan Steemann d92dd90aac fixed instance race condition 2014-02-19 17:10:11 +01:00
Max Neunhoeffer d0865c309f Fix testing.js. 2014-02-19 15:50:24 +01:00
Jan Steemann dd5b172e2c fixed race conditions 2014-02-19 14:55:21 +01:00
Frank Celler 726144ce39 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
 2014-02-19 14:30:46 +01:00
Frank Celler c779325b5d added frontend-development switch 2014-02-19 14:28:51 +01:00
Jan Steemann 9652ee8b14 cluster start 2014-02-19 11:06:12 +01:00
Jan Steemann 66bc4c9a41 allow unique index creation on shard keys only 2014-02-19 10:30:41 +01:00
Jan Steemann badf0d26db fixed jslint warning 2014-02-18 16:55:12 +01:00
Jan Steemann 4c29662e90 initialise foxx 2014-02-18 16:47:55 +01:00
Jan Steemann dc8e590bca inedges, outedges, edges 2014-02-18 13:46:09 +01:00
Max Neunhoeffer 1c05f12c67 Create system collections in kickstarter. 2014-02-18 11:52:09 +01:00
Jan Steemann 5cbfcd6dcc fixed example query 2014-02-18 11:13:20 +01:00
Max Neunhoeffer a0d1888437 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-18 10:15:51 +01:00
Max Neunhoeffer 8b8c8d2fdc Fix jslint. 2014-02-18 10:15:32 +01:00
Jan Steemann 682e00245b fulltext 2014-02-18 10:14:52 +01:00
Jan Steemann 6c3c4b5dce near/within 2014-02-18 09:47:33 +01:00
Jan Steemann 170bb488b9 fixed failing test 2014-02-18 09:04:51 +01:00
Michael Hackstein 49f91512ba Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-18 08:50:32 +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
Max Neunhoeffer 4d1020321b Start to add command line tools for cluster and creation of system colls. 2014-02-17 23:58:52 +01:00