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

11616 Commits

Author SHA1 Message Date
gschwab fe596f98d6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-14 08:50:09 +01:00
gschwab 2032a0dab4 fixed index problem 2014-03-14 08:49:10 +01:00
Jan Steemann fe8d51dda2 updated CHANGELOG 2014-03-13 23:57:08 +01:00
Jan Steemann f4752e8f91 added tests for error codes and messges 2014-03-13 23:56:45 +01:00
Jan Steemann 19fb30db14 Revert "free barriers properly" 
This reverts commit 35a74cf20ce1fa7f801b375fe7a6a51da9536ee5.

Conflicts:
	arangod/V8Server/v8-query.cpp
 2014-03-13 23:28:11 +01:00
Jan Steemann 1cd29e0bb4 fixed typo in comment 2014-03-13 23:02:51 +01:00
Jan Steemann 31d7280995 updated changelog 2014-03-13 22:18:02 +01:00
Jan Steemann e1ad20cb85 added derived file 2014-03-13 22:17:21 +01:00
Jan Steemann f7a9023c7c fix error message & number return in arangosh 2014-03-13 22:06:06 +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
Jan Steemann 4cd329090b free barriers properly 2014-03-13 20:09:53 +01:00
Jan Steemann bef0a661a1 silence compiler 2014-03-13 20:09:43 +01:00
Jan Steemann 428ab599f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-13 19:02:57 +01:00
Jan Steemann 40445d973e negate condition for iterate markers 2014-03-13 18:11:26 +01:00
gschwab 9e5eee9ea0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-13 15:24:44 +01:00
gschwab 7e6f32bc6f fixed problem with button colors 2014-03-13 15:24:35 +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 bb49ae6c91 Use separate configurations for coordinator and dbservers. 2014-03-13 10:26:19 +01:00
Max Neunhoeffer 0d3b1eccb4 Do not remove logs directory after ruby tests. 2014-03-13 09:51:46 +01:00
Jan Steemann 6f3b4725f6 removed hash array statistics 2014-03-12 19:56:23 +01:00
Frank Celler f44f55b280 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-12 18:19:54 +01:00
Frank Celler 56eb394f04 replace is now a protected virtual method 2014-03-12 18:19:50 +01:00
Jan Steemann 0dfac28f71 jslint 2014-03-12 17:54:28 +01:00
Jan Steemann 0862d45f0a fixed collection type selection when creating collection via web interface 
Conflicts:
	CHANGELOG
 2014-03-12 17:54:11 +01:00
gschwab f20e253daf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-12 16:41:39 +01:00
gschwab d93bf89b60 added id to info-button 2014-03-12 16:41:29 +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 65f66ec6d9 changed expression to satisfy clang 2014-03-12 15:40:57 +01:00
gschwab 7d70117186 fixed multiple ids 2014-03-12 15:14:26 +01:00
gschwab ce6f54db96 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-12 15:10:09 +01:00
gschwab 0bae26d890 fixed save action of edit collection 2014-03-12 15:09:59 +01:00
Jan Steemann ff2198151b fixed vector insert at end 2014-03-12 14:27:51 +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
Jan Steemann 9da8d0ddfe allow startup options `temp-path` and `default-language` to be specified from the command-line and not only from config files 2014-03-12 12:12:58 +01:00
Max Neunhoeffer 7b9e40ade6 Fix the initialiser order to please the compiler. 2014-03-11 19:49:11 +01:00
Heiko Kernbach 51d7f07a38 corrected design error 2014-03-11 18:40:54 +01:00
Heiko Kernbach 09ac30a9e7 corrected design error 2014-03-11 18:40:15 +01:00
Heiko Kernbach 6bf3c91fb8 scss fixed warning 2014-03-11 18:36:58 +01:00
Heiko Kernbach 039312e39c scss fix 2014-03-11 18:15:46 +01:00
Heiko Kernbach 68cf81f9e0 delay counter for server is offline notification 2014-03-11 18:01:25 +01:00
Heiko Kernbach b6c4a87055 new shortcuts class added to aqleditor 2014-03-11 17:45:42 +01:00
Heiko Kernbach 4b3829e3a8 added shortcuts for docs editor, added scss shortcut class 2014-03-11 17:29:43 +01:00
Max Neunhoeffer d76c0dd6d3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-11 16:13:27 +01:00
Max Neunhoeffer 7014f0bcb0 Circumvent a Visual Studio Express 2013 compiler bug. 2014-03-11 16:13:03 +01:00
Heiko Kernbach 89245e0ce3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-11 15:18:43 +01:00