1
0
Fork 0
Commit Graph

26338 Commits

Author SHA1 Message Date
Frank Celler 8f1e79e5dc Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-15 23:23:44 +01:00
Frank Celler 9a2ced5056 raised waitForSync 2016-02-15 23:22:50 +01:00
Alan Plum 1c4b0f5da1 Remove obsolete JS error codes 2016-02-15 22:56:34 +01:00
Alan Plum 6593f3d358 Clean up stacktraces
Fixes #1564, #1565, #1744.
2016-02-15 22:56:29 +01:00
Frank Celler f0c849d93a increased wait 2016-02-15 21:39:59 +01:00
Max Neunhoeffer ed914bb3e6 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-02-15 20:54:20 +01:00
Max Neunhoeffer 0902edc257 Fix jslint error. 2016-02-15 20:50:12 +01:00
Michael Hackstein 4a7bc9ad95 Removed unnecessary JSON 2016-02-15 17:48:20 +01:00
hkernbach e42e11d5fc grunt build 2016-02-15 17:13:31 +01:00
hkernbach f170ee0350 web ui: prep for creating and loading collections/documents async, prep for index creation check 2016-02-15 17:13:09 +01:00
Jan Steemann 90c89717b8 make v8 compile with VS 2015 2016-02-15 12:48:39 +01:00
Frank Celler f8d8c9f920 added missing cmake file 2016-02-15 11:59:51 +01:00
Michael Hackstein bb264d89f8 Removed VPackSlice const from std::containers. It is against the standard and compiles somehow with clang but not with g++4.9 2016-02-15 11:21:40 +01:00
Michael Hackstein 2c6c31004c Silenced parentheses warning 2016-02-15 10:53:35 +01:00
Michael Hackstein 835e077836 Fixed a linux compile bug with default parameters. Now they have no defaults any more. 2016-02-15 10:51:12 +01:00
Max Neunhoeffer b16f2406bc Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-02-15 10:30:06 +01:00
Max Neunhoeffer 9d3446afe5 Stop WAL collection before synchronization of shard. 2016-02-15 10:29:06 +01:00
Michael Hackstein a3cd1aa54e Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-15 10:25:31 +01:00
Wilfried Goesgens 2e90ac4bda Merge pull request #1729 from sleepycat/devel
documentation: Clean up typos on graphs page.
2016-02-15 10:21:22 +01:00
Jan Steemann d32b2b62e5 set file descriptor properly 2016-02-15 09:56:40 +01:00
Max Neunhoeffer 459a540867 Merge branch 'devel' into ClustUp2 2016-02-15 09:16:01 +01:00
hkernbach e96fc9c8fd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-15 08:53:56 +01:00
hkernbach 35c7daf223 web ui - notification used instead of error, added missing template 2016-02-15 08:53:47 +01:00
Frank Celler 8da0c61de8 fixed jslint 2016-02-14 17:14:00 +01:00
Frank Celler 6ac522f9ea added jslint script 2016-02-14 16:50:41 +01:00
Frank Celler 687f7fdd72 higher wait intervall 2016-02-14 15:34:03 +01:00
Max Neunhoeffer 4cbd99a54b Merge branch 'devel' into ClustUp2 2016-02-13 23:06:22 +01:00
Max Neunhoeffer 1065486a77 First version of getting shards in sync working. 2016-02-13 23:04:20 +01:00
Frank Celler 0f88ade568 raised sleep 2016-02-13 21:36:51 +01:00
Michael Hackstein c8e0d417ba Added VPack Variant for IS_SAME_COLLECTION. This was the function without a VelocyPack variant. AQL Functions are now ready to be switched. 2016-02-13 14:46:32 +01:00
Michael Hackstein a52e70c3f5 Added a VPack Variant for AQL FULLTEXT function 2016-02-13 14:40:10 +01:00
Michael Hackstein bfddd69a03 Added a velocypack variant of POSITION and RANGE. 2016-02-13 14:30:43 +01:00
Michael Hackstein 521be3c08e Added VPack variant of PERCENTILE and MEDIAN 2016-02-13 14:15:09 +01:00
Michael Hackstein 0688392364 Added a velocypack variant of stdDev and variance to AQL 2016-02-13 14:00:40 +01:00
Michael Hackstein 8cbac0258a Added VPack implementation for NotNull, CurrentDatabase and CollectionCount 2016-02-13 13:48:34 +01:00
Mike Williamson 770a4751dc documentation: Clean up typos on graphs page. 2016-02-12 17:33:32 -05:00
Jan Steemann b734e4c228 don't log to the same output multiple times 2016-02-12 19:12:56 +01:00
Jan Steemann 20aebf6cc0 fix some Visual Studio 2015 errors 2016-02-12 19:10:52 +01:00
Kaveh Vahedipour 2955f33006 Checking C++11 features. 2016-02-12 17:43:45 +00:00
Kaveh Vahedipour f313c7120d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-12 17:08:13 +00:00
Jan Steemann 13cceddbcc removed linenoise option 2016-02-12 18:07:42 +01:00
Kaveh Vahedipour 8ac5ccfdff Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-12 17:06:03 +00:00
Kaveh Vahedipour ce9ec76199 ENABLE_RELATIVE 2016-02-12 17:05:43 +00:00
Wilfried Goesgens 1c8acea215 On solaris we need to hide ERR... 2016-02-12 17:03:31 +01:00
Wilfried Goesgens d85e19c902 Depending on which solaris version we compile at, these facilities can be unknown. 2016-02-12 17:03:24 +01:00
Wilfried Goesgens ee94d45bea Use fcntl instead of flock, this is more modern and better portable. 2016-02-12 17:03:16 +01:00
hkernbach 613985443d web ui - moved indices view, added tab bar engine to modals 2016-02-12 16:16:50 +01:00
Kaveh Vahedipour 5d3fe9afe6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-12 15:53:11 +01:00
Kaveh Vahedipour c3212f2d5d added support for detection of cpu_family 6 model 61 2016-02-12 15:33:53 +01:00
Kaveh Vahedipour 975ce8e461 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-12 14:10:42 +00:00