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

12776 Commits

Author SHA1 Message Date
jsteemann 1ce4d4a97e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 15:29:59 +01:00
jsteemann 92f61416ca Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 15:25:17 +01:00
Jan Christoph Uhde 0f3e42cf26 Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  Fix unused variables
  don't allow to run against pre-running server - it may fail
  arangoexport: continue documentation
 2017-02-13 15:23:18 +01:00
Andreas Streichardt e3d8f19368 Fix unused variables 2017-02-13 15:22:58 +01:00
Jan Christoph Uhde 82f91cfa1b prepare move of compaction to physicalcollection 2017-02-13 15:22:38 +01:00
jsteemann 7e690a0c61 renaming 2017-02-13 15:18:40 +01:00
Michael Hackstein e0bdc5c122 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 14:58:54 +01:00
Michael Hackstein 0c30c290c6 Moved parts of LogicalCollection->insert() into the PhysicalCollectioN 2017-02-13 14:38:22 +01:00
Jan Christoph Uhde ab5d307567 Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  jslint
  arangoexport: continue documentation
  Fix secondaries
  arangoexport: continue documentation
  added missing file
  remove global namespace include
 2017-02-13 14:36:46 +01:00
jsteemann 5d5d8b0a93 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 14:36:39 +01:00
jsteemann 16189aa969 moved TransactionHints.h 2017-02-13 14:36:27 +01:00
Andreas Streichardt 1bb8f97773 Fix secondaries 2017-02-13 14:00:19 +01:00
jsteemann 101fac3fa8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 13:31:36 +01:00
jsteemann eb73dbf960 renaming 2017-02-13 13:30:57 +01:00
jsteemann b3ac54d065 remove global namespace include 2017-02-13 13:03:33 +01:00
Jan Christoph Uhde 27309d1de0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb: (47 commits)
  arangoexport: continue documentation
  arangoexport: documentation continued
  arangoexport: config for client package
  arangoexport: refix xml attribute escaping
  arangoexport: Documentation
  README_maintainers: mention pythons webserver to view generated documentation
  arangoexport: Documentation
  arangoexport: start documentation
  arangoexport: switch to LOG_TOPIC
  arangoexport: xgmml encode attribute values
  arangoexport: remove unnecessary xmlns declaration
  arangoexport: added stats http, written size
  arangoexport: take --xgmml-label-attribute into account
  arangoexport: xgmml set label attribute
  arangoexport: error msgs improvements, dont create file if collection or graph are 404
  added arangoexport to Documentation/CMakeLists
  updated ReleaseNotes and added NewFeatures32
  arangoexport: added manpage
  arangoexport: mention in CHANGELOG
  arangoexport: inital work on test
  ...
 2017-02-13 12:59:58 +01:00
jsteemann f09ec85127 renaming 2017-02-13 12:27:26 +01:00
Kaveh Vahedipour 27c35dd782 WFS set 2017-02-13 12:02:33 +01:00
Jan Christoph Uhde 163b3d45bf remove fullyCollected and friends from LogicalCollection 2017-02-13 11:47:22 +01:00
jsteemann fa2e98ded6 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 10:50:40 +01:00
Michael Hackstein 4b604d798f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-13 10:49:36 +01:00
Kaveh Vahedipour 0a03034d15 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-13 10:48:43 +01:00
Kaveh Vahedipour a86ae11d76 fixed wrong logic in FailedLeader job 2017-02-13 10:48:31 +01:00
Jan Christoph Uhde 6249055f56 remove RocksDBEngine from EngineSelectorFeature 2017-02-13 10:44:13 +01:00
Michael Hackstein c10fbf8b13 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 10:40:59 +01:00
Michael Hackstein 3add00025a Fixed a possible throw in destructor. 2017-02-13 10:40:42 +01:00
jsteemann f5d83935f0 renamed class 2017-02-13 10:12:36 +01:00
Michael Hackstein 85b2cf8ca2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-13 09:59:32 +01:00
Max Neunhoeffer 3658379067 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-02-13 09:58:07 +01:00
Max Neunhoeffer c5d79c5a85 Fix Supervision bug in failedFollower. 2017-02-13 09:57:47 +01:00
Michael Hackstein f4c558096a Merge branch 'engine-api' of github.com:arangodb/arangodb into devel 2017-02-13 09:50:43 +01:00
jsteemann eea22a4971 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 09:45:44 +01:00
Kaveh Vahedipour 51fe9fae6c when registering callbacks fail, we should have some' to go on 2017-02-13 09:00:56 +01:00
jsteemann 8b273b5eaf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 08:37:41 +01:00
Frank Celler 392e8233eb fixed compile error on Mac 2017-02-12 18:32:12 +01:00
Frank Celler 9f63ca6d21 added topic SSL 2017-02-12 18:19:24 +01:00
Michael Hackstein 5c7b971122 Removed the old slice based skiplist iterator and renamed SkiplistIterator2 => SkiplistIterator 2017-02-12 12:59:14 +01:00
Michael Hackstein 9be60be0b9 Removed AnyDirectionEdgeIndexIterator. Not used anymore, internally there is no ANY 2017-02-12 12:44:25 +01:00
jsteemann 1e78acad49 fix size_t vs uint64_t confusion 2017-02-10 23:43:47 +01:00
Jan Christoph Uhde 16a9ddd78d fix ServerState.cpp 2017-02-10 20:52:26 +01:00
Jan Christoph Uhde b0c4b7b38a remove rocksdb engine from build 2017-02-10 20:40:47 +01:00
Andreas Streichardt 39436dac89 Finally remove lock methods 2017-02-10 19:47:31 +01:00
Andreas Streichardt 488b71cf54 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-10 19:40:51 +01:00
Andreas Streichardt fe07f3515f Fixup registering with agency 2017-02-10 19:35:11 +01:00
Michael Hackstein 48166a294c TraversalNode now does not know anything about EdgeIndexes any more. Removed isMMFilesEdgeIndex from Transaction, no obsolete 2017-02-10 18:18:23 +01:00
Max Neunhoeffer dad4f34f7a Fix a wrong log message. 2017-02-10 17:44:18 +01:00
Kaveh Vahedipour 7fbf9fb621 AgencyCallBacks registry and unregistry are more talkative than bool 2017-02-10 17:31:26 +01:00
Kaveh Vahedipour 6aa7080803 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-10 17:03:24 +01:00
Kaveh Vahedipour 76e5dec3d7 agent with less traffic 2017-02-10 17:03:15 +01:00
Michael Hackstein 01d5559ad5 Removed unnecessary includes 2017-02-10 16:28:05 +01:00