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

1320 Commits

Author SHA1 Message Date
jsteemann fbd254bf22 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-26 23:30:47 +02:00
jsteemann 1832670e8f global exception catch block 2016-04-26 23:23:06 +02:00
Frank Celler 59b93fa121 fixed shutdown 2016-04-26 20:46:03 +02:00
Wilfried Goesgens e31cb1492d Fix solaris port: move syslog adoption into the logger library. 2016-04-25 18:02:44 +02:00
Michael Hackstein ecf267f369 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-25 15:25:31 +02:00
Michael Hackstein 85a2c3a44c The shortestPath computation now uses Slices instead of strings to identify the documents. 2016-04-25 15:25:22 +02:00
Jan Steemann 80bf3bbbb2 fixed some of my own noobness 2016-04-25 14:00:37 +02:00
Jan Steemann 5ea01c02b0 fixed number of threads detection 2016-04-25 13:57:59 +02:00
jsteemann 1fb953a515 improve insertion time 2016-04-25 10:40:48 +02:00
Frank Celler b0f418ac84 removed unused function 2016-04-24 13:59:28 -07:00
jsteemann e0dd623865 removed duplicate declarations 2016-04-24 20:17:39 +02:00
jsteemann dcc5825f93 cleaned up features a bit 2016-04-24 14:29:29 +02:00
Frank Celler 2cb73ce625 cosmetics 2016-04-23 22:14:57 -07:00
Frank Celler d6e8046992 updated cleanupCFiles 2016-04-23 16:34:57 -07:00
jsteemann 7866e5da1f allow out of memory 2016-04-23 21:11:35 +02:00
jsteemann 0da9ac7cdc micro optimizations 2016-04-23 16:23:15 +02:00
jsteemann e6b39a8fe8 added simple infrastructure for timing 2016-04-23 11:20:52 +02:00
Frank Celler 5335a5b0af moved to Random 2016-04-21 22:53:20 -07:00
Frank Celler 09b81c1314 fixed name for windows 2016-04-21 22:32:44 -07:00
Jan Steemann 7e9e5a96cb fixed endless recursion 2016-04-21 18:35:32 +02:00
Jan Steemann 485978e646 fixed over-/underflow 2016-04-21 15:51:26 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Jan Steemann 48d0a1cbb5 micro optimizations 2016-04-21 12:46:53 +02:00
Simran Brucherseifer a5ad9f33a9 Minor corrections 
Excluded Aardvark, the graph viewer in particular
 2016-04-20 22:09:00 +02:00
Kaveh Vahedipour d53e47c7d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-04-20 11:23:10 +00:00
Michael Hackstein 0cb3741e4f Fixed a bug in assoc multi. One result container was not handed in by reference. 2016-04-20 11:19:55 +02:00
Michael Hackstein 3407f4b111 The edge index now hands-in the result vector for doc mptr to AssocMulti. Also fixed the batch size for index lookups 2016-04-20 09:16:51 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
jsteemann 316a1bd190 starting support for Externals 2016-04-19 22:31:40 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
 2016-04-19 07:44:00 +02:00
Jan Steemann 917a1744c9 updated vpack library 2016-04-18 15:30:26 +02:00
Frank Celler 17cd890132 WIP 2016-04-16 20:29:33 -07:00
Frank Celler 2dd798cd48 WIP 2016-04-15 22:09:55 -07:00
Frank Celler dd44191a91 WIP 2016-04-15 21:03:53 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Michael Hackstein 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Kaveh Vahedipour d247e7a3bd mop is fixing the cluster load 2016-04-13 15:36:11 +02:00
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
Frank Celler 3f9dd62d4c WIP 2016-04-13 12:30:18 +02:00
Michael Hackstein a14d7dffe2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-13 08:30:48 +02:00
Jan Steemann c0fd5c5f78 removal of some JSON 2016-04-12 18:21:11 +02:00
Michael Hackstein 97623706b3 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-11 10:09:43 +02:00
Michael Hackstein df497eb8b2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-10 14:09:25 +02:00
jsteemann 607efe8f89 removed unused function 2016-04-09 10:57:07 +02:00
jsteemann 163a61f17b prevent races on shutdown 2016-04-09 00:18:41 +02:00
jsteemann e839150857 use log topics 2016-04-09 00:17:06 +02:00
Jan Steemann f2e2dbb435 pacify valgrind 
added assertion

added assertions
 2016-04-08 15:05:08 +02:00
Michael Hackstein d67b203382 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-08 13:15:16 +02:00
Michael Hackstein 541395a262 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-08 12:42:59 +02:00
Michael Hackstein 12d973504c Fixed babies creation in cluster with undefined keys. 2016-04-08 10:53:11 +02:00