1
0
Fork 0
Commit Graph

294 Commits

Author SHA1 Message Date
Max Neunhoeffer 6e08a96795 Fix bug with empty argument in makeAbsolute. 2014-02-04 11:50:21 +01:00
Max Neunhoeffer 0c8de8a3ae Add fs.makeAbsolute needed by kickstarter. 2014-02-04 11:36:28 +01:00
Max Neunhoeffer 73f3dbc328 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 18:56:47 +01:00
Frank Celler 988bd0b891 added port test 2014-01-31 18:38:02 +01:00
Frank Celler 29f075cfce added external processes 2014-01-31 15:55:51 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
Frank Celler 973f9aa2fb added linenoise 2014-01-30 17:23:24 +01:00
Jan Steemann 5f8a59d696 all() sharded 2014-01-29 13:51:12 +01:00
Jan Steemann 2ced0f6a21 fixed terminal reset 2014-01-27 16:54:48 +01:00
Jan Steemann 1b08bc6582 start up the HTTP server when starting ArangoDB in console mode 2014-01-27 09:45:26 +01:00
Jan Steemann d8b5c60351 fixed segfault 2014-01-24 13:08:33 +01:00
Jan Steemann 481cd2d1be added collection._dbName 2014-01-16 11:10:37 +01:00
Jan Steemann 9c63246d1c added TRI_SHARDING_COLLECTION_NOT_IMPLEMENTED macro 2014-01-14 14:04:29 +01:00
Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	utils/Makefile.files
2014-01-10 17:41:52 +01:00
Jan Steemann 5b965b2a21 added initialised() method 2014-01-07 17:50:52 +01:00
Jan Steemann 9ce78430ac create collections, v0.0.0 2014-01-07 16:28:12 +01:00
Max Neunhoeffer 11e018e6b2 Make global ArangoClusterComm object in each thread. 2014-01-07 11:50:05 +01:00
Max Neunhoeffer bbf28e3501 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangod/Cluster/v8-cluster.cpp
2014-01-07 11:45:43 +01:00
Jan Steemann 3183e6d402 created global cluster object variables 2014-01-07 11:34:42 +01:00
Max Neunhoeffer 33d063d6d6 Start to move ClusterComm to JavaScript. 2014-01-06 16:18:24 +01:00
Jan Steemann d1bee4cf58 added functions to query the server state 2014-01-02 15:13:44 +01:00
Max Neunhoeffer 3415e3c0c8 Some cleanup in asyncRequest setup. 2013-12-30 10:22:21 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Frank Celler 9ac2e751c6 fixed wrong ifdefs and missing constructor for Logger 2013-12-22 14:58:51 +01:00
Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
2013-12-20 15:35:50 +01:00
Frank Celler f7bf96846b Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-19 09:33:02 +01:00
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
2013-12-13 17:58:24 +01:00
Jan Steemann e7ba403998 added --server.ssl-protocol option for client tools 2013-12-13 17:53:51 +01:00
Jan Steemann 67f72b26fa split big group of statistics into 2 separate groups
Conflicts:
	CHANGELOG
2013-12-13 16:08:58 +01:00
Jan Steemann 1010d515bb added detailed HTTP request statistics
Conflicts:
	CHANGELOG
2013-12-13 16:00:02 +01:00
Jan Steemann ed927d26c8 split big group of statistics into 2 separate groups 2013-12-13 15:58:59 +01:00
Jan Steemann 5e5a5fb32b added JS bindings for agency 2013-12-11 09:56:54 +01:00
Frank Celler 86b7fea992 Vs2013 2013-12-07 18:55:55 +01:00
Jan Steemann e79134799c mini optimisations for shaping 2013-11-22 02:41:39 +01:00
Frank Celler 01532b024e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-11-20 13:50:14 +01:00
Frank Celler 6e293d9dce fixed wrong error message on parse error 2013-11-20 13:50:08 +01:00
Jan Steemann cf219d92d3 added debugSegfault 2013-11-20 13:15:45 +01:00
Jan Steemann 920d08d855 removed redundant startup options 2013-11-20 01:50:27 +01:00
Jan Steemann c5e9538547 Merge remote-tracking branch 'origin/devel' into inline-shapes
Conflicts:
	arangod/VocBase/document-collection.c
2013-11-14 01:01:24 +01:00
Jan Steemann 54abc6bd1d fix Windows path name comparison 2013-11-11 20:30:51 +01:00
Jan Steemann 60526230ab fix Windows path name comparison 2013-11-11 20:06:50 +01:00
Jan Steemann d30ca7b658 added `/_api/database/user` method 2013-11-06 09:34:44 +01:00
Jan Steemann 978c12815a share basic shape types 2013-11-05 20:21:48 +01:00
Jan Steemann 90e7ea3f97 typecasts 2013-11-05 10:19:21 +01:00
Jan Steemann 7924f657d4 added `/_api/database/user` method 2013-11-04 14:22:00 +01:00
Jan Steemann e1382dd255 added detailed HTTP request statistics 2013-10-31 16:39:59 +01:00
Jan Steemann bcf6eabce7 fixed --javascript.check option for arangosh 2013-10-30 18:35:08 +01:00
Jan Steemann bc57a0c468 fixed --javascript.check option for arangosh 2013-10-30 18:33:42 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 43b4f78b62 issue #620 2013-10-28 19:38:19 +01:00