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

2156 Commits

Author SHA1 Message Date
Max Neunhoeffer 45cecf44f9 Initialise a few variables to please gcc. 2014-12-16 10:48:07 +01:00
Max Neunhoeffer bf915da2e3 Use an unordered_map for JSBarriers. 2014-12-16 09:57:44 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
Jan Steemann d9a945e33a include or exclude system collections from replication 2014-12-05 14:58:43 +01:00
Jan Steemann 4564f13bc8 implemented LENGTH in C++ 2014-12-04 17:10:48 +01:00
Jan Steemann cc00bb8897 optimizations 2014-12-04 16:33:48 +01:00
Jan Steemann 0cb5b70a3e turned assertions into ifs 2014-12-04 11:15:33 +01:00
Max Neunhoeffer e7d94bf81d Put a loop around select() to take care of EINTR. 2014-12-03 23:45:20 +01:00
Max Neunhoeffer 6e2aed2732 Take out cout debugging output. 2014-12-03 23:37:16 +01:00
Max Neunhoeffer 0fb6ef1968 Fix SimpleHttpClient for the n+1 time. 
Still with debugging output.
 2014-12-03 23:31:20 +01:00
Jan Steemann e4b51f616c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-03 17:46:03 +01:00
Jan Steemann 867183945d fixed memleak in shaper 2014-12-03 17:44:54 +01:00
Max Neunhoeffer 34c31a0980 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-03 16:46:37 +01:00
Max Neunhoeffer 8182539b66 Introduce invariants in processHeader. 2014-12-03 16:46:18 +01:00
Frank Celler 77f544a554 Merge pull request #1144 from triAGENS/less-confusing-http-naming 
Renamed mergeArrays->mergeObjects (because it's actually about objects, not arrays)
 2014-12-03 14:48:04 +01:00
Max Neunhoeffer 7fd0260add Yet more printouts. 2014-12-03 13:30:43 +01:00
Max Neunhoeffer f5e5617155 One more cout. 2014-12-03 11:47:22 +01:00
Max Neunhoeffer 4b099281aa Take some couts out to reproduce bug. 2014-12-03 11:17:23 +01:00
Max Neunhoeffer d938a77531 Take out some couts to reproduce error. 2014-12-03 10:47:26 +01:00
Max Neunhoeffer 776ce77452 Fix a segfault in my couts. 2014-12-03 10:20:54 +01:00
Max Neunhoeffer 41785104d5 Even more couts. 2014-12-03 09:47:20 +01:00
Max Neunhoeffer 658256059f Yet more couts. 2014-12-03 09:44:22 +01:00
Max Neunhoeffer 41b01b78bc Even more couts. 2014-12-03 09:29:02 +01:00
Max Neunhoeffer 4125ffc5b1 Add some couts to finally debug SimpleHttpClient and shell-fm test. 2014-12-03 09:11:10 +01:00
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00
threez 21b498127c Fixed statistics for FreeBSD 
By default it would try to compile the windows code, since the TRI_HAVE_MACOS_MEM_STATS doesn't cover BSD's.
 2014-11-26 16:57:40 +01:00
threez fe02d691d8 Fixes compile issue on FreeBSD/clang 
lib/Basics/logging.cpp:1876:12: error: cannot initialize a variable of type 'CODE *' (aka '_code *') with an lvalue of type 'const CODE [25]'
    CODE * ptr = TRI_facilitynames;
           ^     ~~~~~~~~~~~~~~~~~

FreeBSD clang version 3.4.1 (tags/RELEASE_34/dot1-final 208032) 20140512
Target: x86_64-unknown-freebsd10.1
 2014-11-26 15:05:43 +01:00
Jan Steemann 34eb2a8c5a removed unused functions 2014-11-25 23:18:45 +01:00
Jan Steemann 9846fd0d36 removed unused function 2014-11-24 17:36:11 +01:00
Jan Steemann 620274047f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-functions 
Conflicts:
	CHANGELOG
 2014-11-20 14:23:01 +01:00
fagnercarvalho 61d3846356 Fixing statistics documentation misspelled errors 2014-11-20 09:36:14 +01:00
Frank Celler ec37174083 fixed syslog 2014-11-18 18:16:29 +01:00
Jan Steemann f1f13a4284 added several AQL functions 2014-11-18 11:26:42 +01:00
Max Neunhoeffer dbf1f66841 Fix SimpleHttpClient for the n+1 time. Some major cleanup done. 
Added a lot of comments to explain why it should work now properly.
 2014-11-16 19:56:58 -05:00
Frank Celler ff199b60eb fixed server gone reconnet 2014-11-16 20:58:02 +01:00
Frank Celler cefba69ab5 fixed chunked again 2014-11-15 17:52:10 +01:00
Frank Celler 5a783df66f removed while loop 2014-11-15 17:19:26 +01:00
Frank Celler 77fd12b987 fixed SimpleHttpClient 2014-11-14 23:50:00 +01:00
Frank Celler 5a99807ae0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-14 18:38:19 +01:00
Jan Steemann 1303595594 Visual Studio does not like thread_local 2014-11-14 17:39:01 +01:00
Jan Steemann 777f70c8e2 fixed error message 2014-11-14 16:45:51 +01:00
Jan Steemann 5fda62b725 Merge branch 'aql-feature-lazy-index' of https://github.com/triAGENS/ArangoDB into devel 2014-11-13 18:04:57 +01:00
scottashton 9f48775608 FIXED DOKU 2014-11-13 15:58:02 +01:00
Jan Steemann 2622f57e07 added assertions 2014-11-13 14:15:47 +01:00
Frank Celler 10e07f1982 added generated files 2014-11-12 14:58:51 +01:00
Jan Steemann 7cd1eb5474 more warnings 2014-11-12 14:52:54 +01:00
Jan Steemann 81c1919f44 minor adjustments for task API 2014-11-12 11:27:47 +01:00
Frank Celler 88d1f78464 Merge remote-tracking branch 'origin/2.3' into devel 
Conflicts:
	CHANGELOG
 2014-11-12 04:57:41 +01:00
Frank Celler 9c9bd02454 remove superfluous threads after a grace period 2014-11-10 21:42:32 +01:00