1
0
Fork 0
Commit Graph

2782 Commits

Author SHA1 Message Date
Jan Christoph Uhde ed111a39a1 Merge branch 'devel' into obi-velocystream-try-merge-devel
* devel: (24 commits)
  minor fixes
  fix effect that on second install we will complain about mismatching passwords
  only test for cleaning up 3rdparty if we're parametrized to do so.
  fix CMake so it finds the PythonInterpreter even with oder versions
  hexify corrupted markers
  Fix comments
  fixed cluster start
  issue #2022: double max allowed request body size, cap --batch-size value in arangoimp
  fixed issue #2023: added replicationFactor to docs
  improve the perf script
  fix perfsetupscript
  clean up perf script
  add SYSTEM flag to boost includes to avoid warnings
  Adding Foxx access to agency
  Adding Foxx access to agency
  fix compile warning
  Add missing windows library.
  fix windows compile problems.
  Fix syntax error in windows client installer.
  If we have relative paths that are working, make them absolute so they still work after CWD's of arangod
  ...

Conflicts:
	arangod/Agency/AgentConfiguration.cpp
	arangod/GeneralServer/HttpCommTask.cpp
	arangod/RestServer/DatabaseFeature.cpp
	arangod/VocBase/datafile.cpp
2016-08-30 22:04:31 +02:00
Jan Steemann 9f5e155b4e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-29 08:56:22 +02:00
Jan Steemann 84c9b301ce fixed issue #2023: added replicationFactor to docs 2016-08-29 08:55:48 +02:00
jsteemann 6af38d3c80 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 12:50:19 +02:00
Wilfried Goesgens 197bfd23a6 Fix the location of the sample graphs. 2016-08-25 11:21:50 +02:00
jsteemann 07055384b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:34:59 +02:00
Simran Brucherseifer e294984831 Docs: Limitations in cluster mode 2016-08-24 13:38:47 +02:00
Simran Brucherseifer 1c95b68296 Improve: what to make vertices and dedges 2016-08-23 18:42:34 +02:00
jsteemann 5f06a5c025 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-23 12:13:08 +02:00
Wilfried Goesgens 9bdd84324a Add explanation what to make edges and what vertices. 2016-08-23 10:49:37 +02:00
Simran Brucherseifer d07c3c848c Docs: Add dynamic attribute name example and x-ref to RETURN 2016-08-22 20:59:54 +02:00
Simran Brucherseifer 1e6503d1e0 Docs: Access current/OLD value in UPDATE 2016-08-22 20:59:54 +02:00
Simran Brucherseifer a542735683 Fix docs: INSERT does not have a WITH part 2016-08-22 20:59:54 +02:00
Wilfried Goesgens 7f07678bf7 Add missing arangosh shebang documentation 2016-08-22 16:58:24 +02:00
jsteemann c5f151da5c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-19 11:01:15 +02:00
Alan Plum 76c447e29d
Add module.context.createDocumentationRouter 2016-08-19 00:36:08 +02:00
jsteemann 06b600a632 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 16:51:02 +02:00
jsteemann b8bc3b2592 fixed docs 2016-08-18 16:49:34 +02:00
jsteemann d7b2141da0 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 16:22:00 +02:00
Simran Brucherseifer dd37b5d3f3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-18 13:31:11 +02:00
Simran Brucherseifer 08ad5b6f3d Docs: update header (improve tooltips) 2016-08-18 13:29:03 +02:00
Wilfried Goesgens 7b67a17f64 style fixes 2016-08-18 11:47:48 +02:00
jsteemann 53e567f28f Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 11:30:07 +02:00
Wilfried Goesgens fadbd6a85c Add link to github source of graph examples. 2016-08-18 11:10:27 +02:00
jsteemann 4080f4e8b5 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 08:41:49 +02:00
Simran Brucherseifer 8e15e928b0 Documentation improvments 2016-08-17 18:57:55 +02:00
jsteemann 10e855b488 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-16 16:16:07 +02:00
Alan Plum 5f7fd58056
Revert "Remove iconv-lite"
This reverts commit c9bd40f50a.
2016-08-16 16:08:42 +02:00
jsteemann 209c108c59 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-15 14:34:01 +02:00
Simran Brucherseifer 0de1a20f4a Docs: Data model -> Data models, note that NOT_NULL() is equal to SQL's COALESCE() 2016-08-11 19:49:00 +02:00
Simran Brucherseifer e0800cfd9b Correct HTTP docs about user parameters 2016-08-11 19:49:00 +02:00
Michael Hackstein 7b328d39e9 Merge branch 'devel' of github.com:arangodb/arangodb into engine-vs-velocystream 2016-08-11 12:41:08 +02:00
Simran Brucherseifer daba4ca208 Add download and slack buttons to documentation header 2016-08-09 18:20:45 +02:00
Wilfried Goesgens 821083b7a6 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-08-05 16:05:41 +02:00
Wilfried Goesgens d10d4effa1 Merge branch 'pipeline' of github.com:arangodb/ArangoDB into devel 2016-08-05 16:05:08 +02:00
Wilfried Goesgens 601422bd8b Fix broken links to old cookbooks 2016-08-05 16:03:54 +02:00
Simran Brucherseifer 19267e2b9d Docs: Add db.name.save(), correct uniqueEdges default value 2016-08-05 16:02:48 +02:00
Wilfried Goesgens 0ebc0d9c32 Remove link to erased cookbook 2016-08-05 16:00:00 +02:00
Simran Brucherseifer 8f0b512794 Docs: more AQL UDF, note about indexes and HAS() / IS_NULL() 2016-08-04 21:26:57 +02:00
Simran Brucherseifer bef78d128f Add cross-refs for AQL traversal and migration of graph functions 2016-08-04 21:08:53 +02:00
Wilfried Goesgens ed9a34c7d1 Improve descriptions of UDFs in the cluster. 2016-08-04 17:53:29 +02:00
jsteemann 1139505641 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-04 17:19:05 +02:00
Wilfried Goesgens 1292735dbe more streamlining, links to the UDF documentation. 2016-08-04 14:11:56 +02:00
Wilfried Goesgens 26ac1ce071 By simran: review UDF documentation. 2016-08-04 13:53:49 +02:00
Wilfried Goesgens ecf537af5a Explain clustering impacts in the optimizer chapter. 2016-08-04 13:52:57 +02:00
jsteemann bc6633e4c0 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-04 13:33:10 +02:00
Alan Plum c9bd40f50a
Remove iconv-lite
Apparently iconv-lite doesn't work with the new buffers, even in Node.js.
2016-08-03 15:53:11 +02:00
Alan Plum 742bb39f7c
Add iconv-lite and timezone 2016-08-03 15:47:07 +02:00
jsteemann cc51773a46 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-01 17:17:05 +02:00
Wilfried Goesgens e306ef019e Add missing body parameter descriptin. Thanks to @janavolkova9 for pointing this out. 2016-08-01 12:25:37 +02:00