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

26217 Commits

Author SHA1 Message Date
Michael Hackstein 96b75d3733 Added a VPack Implementation for AQL Neighbors. This involved modification of Traverser and ExampleMather to understand VPack as well 2016-02-05 08:45:20 +01:00
Frank Celler 63a994268b added ETCD_NONO 2016-02-04 22:31:15 +01:00
Frank Celler e98c8b0758 changed sync to actively wait for result to avoid timeouts 2016-02-04 22:20:35 +01:00
Jan Steemann 3b1c3cd37d prevent compile warning with clang 2016-02-04 19:31:44 +01:00
Jan Steemann 94990da5f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-04 19:18:43 +01:00
Jan Steemann 51d4df998d cleanup 2016-02-04 19:12:27 +01:00
Wilfried Goesgens 4d1f8a5164 Move solaris specific stuff into its own header. 2016-02-04 17:54:46 +00:00
Jan Steemann 9ff2684f92 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-04 18:41:36 +01:00
Jan Steemann a6353c053f fixed Windows build 2016-02-04 18:41:13 +01:00
Wilfried Goesgens a13432a988 Fix solaris compile 2016-02-04 17:38:42 +00:00
Jan Steemann 8584a2a7af treat unlimited rlimit values specially 2016-02-04 18:34:39 +01:00
Jan Steemann a71f65f873 potential fix 2016-02-04 18:05:48 +01:00
Jan Steemann 6efae7120d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-04 17:47:43 +01:00
Jan Steemann 35e2284146 don't malloc log string twice 2016-02-04 17:47:26 +01:00
Andreas Streichardt de6babd26c Remove obsolete init_agency.js 2016-02-04 17:43:22 +01:00
Andreas Streichardt 8ef62d3bd2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-04 17:29:39 +01:00
Andreas Streichardt c0ed7f0429 Add peggy 2016-02-04 17:29:08 +01:00
Jan Steemann 35a57a194e removed unused variable 2016-02-04 17:05:51 +01:00
Jan Steemann 437160f921 minor datafile statistics correction 2016-02-04 16:54:10 +01:00
Frank Celler 7769b68d69 fixed returns 2016-02-04 16:46:29 +01:00
Frank Celler 0dff6cfaa1 cleanup 2016-02-04 16:38:35 +01:00
Frank Celler 8b6f4b8bec removed DEV_APP_PATH 2016-02-04 16:38:20 +01:00
Max Neunhoeffer fc94a38184 Add an InitDone stamp to cluster plan. 2016-02-04 15:53:42 +01:00
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
Michael Hackstein edf7f6b9d9 Further implementation of AQL functions for VPack. UNIQUE UNIQUE_SORTED UNION UNION_DISTINCT 2016-02-04 15:23:26 +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
Michael Hackstein 84b1f9055d Further implementation of VPackAqlValue functions. This included VALUES and ATTRIBUTES. These functions by accident had an ordering in TRI_json_t which they do not have any more in VelocyPack. Clarified Documentation. 2016-02-04 13:49:59 +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
Max Neunhoeffer 7a92f3ac0f Merge branch 'devel' into ClustUp2 2016-02-04 09:39:46 +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