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

25768 Commits

Author SHA1 Message Date
Jan Steemann 56c3274749 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-04 15:29:24 +01:00
Jan Steemann 34c402cb05 attempt to fix assertion in Cluster 2016-02-04 15:29:02 +01:00
Wilfried Goesgens e68f483177 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-02-04 15:12:13 +01:00
Wilfried Goesgens 5439da1b7a Merge branch 'doublerebel-devel-solaris' into devel 2016-02-04 15:11:58 +01:00
Wilfried Goesgens acc17daa96 Merge branch 'devel-solaris' of https://github.com/doublerebel/arangodb into doublerebel-devel-solaris 
Fix Conflicts:
	arangod/FulltextIndex/fulltext-index.cpp
	lib/Basics/logging.cpp
 2016-02-04 15:11:34 +01:00
Jan Steemann f313717df0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-04 15:07:42 +01:00
Jan Steemann 699b2435ca fix unnecessary increase of reference counter 2016-02-04 15:07:23 +01:00
Frank Celler 425473112f added new logger options 2016-02-04 14:08:28 +01:00
m0ppers 8f96fc3d94 Merge pull request #1704 from m0ppers/initializecluster 
Initializecluster
 2016-02-04 13:43:56 +01:00
Andreas Streichardt 63b2cdbe1b fix code review comments 2016-02-04 13:40:15 +01:00
Jan Steemann a0b7eb3efa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-04 12:39:19 +01:00
Jan Steemann 3269c59a06 fixed some compile warnings 2016-02-04 12:38:51 +01:00
Frank Celler 7be4ad5a21 unified naming (.txt => .json) 2016-02-04 12:36:48 +01:00
Frank Celler ea040037cb unified naming (all_ok, ok => status) 2016-02-04 12:34:31 +01:00
Andreas Streichardt 40b844c7b0 Merge branch 'devel' of github.com:arangodb/arangodb into initializecluster 2016-02-04 12:33:28 +01:00
Jan Steemann 0ff20a6590 try to work around compiler warning 2016-02-04 12:32:56 +01:00
Frank Celler b44385d9ef fixed deprecated options 2016-02-04 12:08:23 +01:00
Andreas Streichardt 9e7beb9a6e Change LOG WARNING and ERROR 2016-02-04 11:43:10 +01:00
Jan Steemann 6bac50d372 don't compact in one special case 2016-02-04 11:37:46 +01:00
Andreas Streichardt f096580706 Merge remote-tracking branch 'upstream/devel' into initializecluster 2016-02-04 11:37:02 +01:00
Andreas Streichardt adce528373 Proper initialization 
Also find a fitting spot for our role
 2016-02-04 11:29:43 +01:00
Jan Steemann 5964ecb005 removed unused function 2016-02-04 11:10:42 +01:00
Jan Steemann 657ac8d50f fixes for Windows 2016-02-04 09:36:29 +01:00
Jan Steemann a01e52f4cd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-04 09:07:57 +01:00
Jan Steemann b7fddb15ad handle compile warnings 2016-02-04 09:07:36 +01:00
Max Neunhoeffer 048f523714 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-02-04 09:00:43 +01:00
Max Neunhoeffer 391c03e68a Fix initial value of HTTP response code in ClusterComm. 2016-02-04 09:00:23 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Jan Steemann ac0446faf2 fixed potential truncation of master pointer list when rolling back update operations 2016-02-03 18:51:22 +01:00
Alan Plum 77b0c9c6bf Add dedent dependency 2016-02-03 16:35:14 +01:00
Wilfried Goesgens eab4e19e69 Clarify fire and forget jobs. 2016-02-03 16:24:58 +01:00
Alan Plum 28e094702e Restore swagger/index-alt.html 
This is the alternative "inline" version of index.html. Please recreate by diffing against index.html when upgrading Swagger.
Please make sure Swagger is still working in Aardvark after upgrading Swagger.
 2016-02-03 15:10:12 +01:00
Wilfried Goesgens 3188f567cc Add scripts to read /etc/mime.types as found on many linux distributions into a collection 2016-02-03 11:23:36 +01:00
jsteemann d9de65acf8 remove now useless casts when invoking logger 2016-02-02 21:38:01 +01:00
jsteemann 74bf32d723 more detailed logging for mmap operations, added mmap log section 2016-02-02 21:36:25 +01:00
Wilfried Goesgens 58e023aac5 Merge pull request #1701 from kibarda/devel 
documentation: links between fulltext chapters
 2016-02-02 17:51:24 +01:00
jmvan f504707c1d documentation: links between fulltext chapters 2016-02-02 17:41:40 +01:00
Richard Parker 0e3ce44885 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-02-02 14:54:54 +00:00
Richard Parker 35973ae675 Detect invalid lat/longitude on remove and searches 2016-02-02 14:52:08 +00:00
Jan Steemann bfd5d6614a fixed namespace usage 2016-02-02 15:10:44 +01:00
Jan Steemann 3f6f75db5e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-02 15:07:52 +01:00
Frank Celler e9dbd6f648 fixed test for significant attribute 2016-02-02 14:46:28 +01:00
Jan Steemann 11736660d8 removed namespace 2016-02-02 14:41:34 +01:00
Jan Steemann 5eb9687e21 turn off deadlock detection in cluster 2016-02-02 14:02:28 +01:00
Jan Steemann 2485898216 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-02 14:02:03 +01:00
Jan Steemann 48f1ce865b don't swallow detailed return codes 2016-02-02 14:01:26 +01:00
Jan Steemann 94ffc16e15 always clean up 2016-02-02 13:08:01 +01:00
Frank Celler 3709cd823e generate UNITTEST_RESULT_CRASHED, use inspect, set defaults 2016-02-02 12:56:31 +01:00
Jan Steemann bc6fce75d4 removed some unnecessary explicits 2016-02-02 12:13:21 +01:00
Wilfried Goesgens e743e6984d Add notes about backup and restore of graphs. 2016-02-02 11:34:38 +01:00