1
0
Fork 0
Commit Graph

225 Commits

Author SHA1 Message Date
Simon Grätzer 27dcb11af3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-13 15:00:59 +01:00
jsteemann ac7d9af48f attempt to validate utf8 sequences in vst 2017-01-12 13:22:19 +01:00
Simon Grätzer 0b5a1f6b70 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-11 14:47:00 +01:00
Wilfried Goesgens 071b6c199e remove unused headers 2017-01-11 11:54:15 +01:00
Simon Grätzer 9a6c7196a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-26 20:52:29 +01:00
Max Neunhoeffer d37e887eb9 Merge conflict. 2016-12-23 12:11:44 +01:00
Simon Grätzer 7afebc2223 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-17 14:10:03 +01:00
jsteemann 4f10a6fb9c experimental micro optimizations 2016-12-16 15:52:16 +01:00
Simon Grätzer d1a47f5b29 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-15 18:46:21 +01:00
jsteemann 9b42e9cee6 some improvements for memory management
added more memory diagnostics for memory usage:
- collection.figures() now returns a "readCache" attribute which contains the
  number of and memory usage of entries in the document revisions cache for the
  collection, and a "revisions" attribute with the number and memory usage
  of entries in the storage engine's revision lookup table for the collection
- the default value for --database.revision-cache-target-size was changed from
  75% of RAM to 30% of RAM
2016-12-15 15:30:28 +01:00
Simon Grätzer 5889ebb32b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-13 13:54:29 +01:00
jsteemann b96897e296 fixed some issues detected by coverity build tool 2016-12-12 15:41:54 +01:00
Simon Grätzer 4fe234803e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-09 17:37:51 +01:00
jsteemann 995b47fa8d remove unused code 2016-12-09 17:16:58 +01:00
Simon Grätzer 7ef7857006 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-28 22:27:14 +01:00
Frank Celler 4339f27c22 added missing header 2016-11-28 17:05:50 +01:00
Simon Grätzer bc4c441f30 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 17:03:26 +01:00
Kaveh Vahedipour 029ff44bb0 Merge back FMH to devel 2016-11-25 16:03:13 +01:00
jsteemann 15487d49ba use make_unique 2016-11-25 15:35:54 +01:00
jsteemann 94865160f5 use make_unique 2016-11-25 15:12:30 +01:00
jsteemann 363263b054 use TRI_ASSERT 2016-11-25 14:30:54 +01:00
Simon Grätzer 9bcf8cd407 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 12:30:39 +01:00
Jan Christoph Uhde 22bc12825b switch to arangodb mutexes 2016-11-24 10:40:40 +01:00
Jan Christoph Uhde 199c82c1f8 switch back to unordered_map by using unique_ptr 2016-11-24 10:07:05 +01:00
Jan Christoph Uhde 1dfc0d8243 remove deadlock 2016-11-24 09:41:43 +01:00
Jan Christoph Uhde 2325fbfbe1 fix race condition 2016-11-24 08:59:21 +01:00
Kaveh Vahedipour b464b378bf new transact api for agency 2016-11-23 17:59:48 +01:00
Jan Christoph Uhde b9700165bb work on agent creation in vpp commTask 2016-11-23 15:05:33 +01:00
Jan Christoph Uhde e543eed70d Merge branch 'devel' of github.com:arangodb/arangodb into devel
* 'devel' of github.com:arangodb/arangodb:
  remove -q - it doesn't work with older git versions
  Fix a typo.
2016-11-23 14:07:02 +01:00
Jan Christoph Uhde b40a18aac1 pass startTime into processRead 2016-11-23 14:06:36 +01:00
Simon Grätzer 66951f4f8e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-23 13:17:27 +01:00
Max Neunhoeffer 9a7f5af465 Fix a typo. 2016-11-23 11:48:40 +01:00
Jan Christoph Uhde 2bd70e5b9f fix request statistics and add a ruby test 2016-11-23 11:29:25 +01:00
Kaveh Vahedipour ab34880bea Merge remote-tracking branch 'origin/devel' into FMH 2016-11-22 10:30:25 +01:00
Simon Grätzer e4bc60a755 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-21 17:44:12 +01:00
Andreas Streichardt 02eb298f0c extra startup check: enforce that the user set a jwt-secret when running in cluster mode with authentication enabled 2016-11-18 16:15:09 +01:00
Kaveh Vahedipour ffe7f9f3ad merged in devel 2016-11-16 14:59:53 +01:00
Simon Grätzer 58288283ce Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-09 12:12:59 +01:00
Jan Steemann cb4a471dfd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-09 08:26:20 +01:00
Jan Steemann b0119bb652 issue #2149, issue #2159
do not overwrite CORS response headers set by Foxx application with hard-coded default values
2016-11-09 08:25:45 +01:00
Jan Christoph Uhde 2dc309db38 make protocol switching less verbose 2016-11-08 15:18:50 +01:00
Simon Grätzer bcf545c856 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-08 11:38:49 +01:00
Frank Celler a1003cb5d3 cosmetics 2016-11-07 17:20:56 +01:00
Simon Grätzer 1c0253e5dc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-03 00:12:56 +01:00
Jan Steemann eeac8e5ae9 remove unused test code 2016-10-31 13:08:13 +01:00
Jan Steemann 9957dab8dc remove non-unused PathHandler 2016-10-31 12:15:07 +01:00
jsteemann cfc9ecd198 fix Visual Studio complaints 2016-10-31 09:59:18 +01:00
Jan Christoph Uhde 8e7841a1c4 remove verbose message 2016-10-27 14:39:17 +02:00
Jan Christoph Uhde cea5f9def6 try to fix some windows warnings 2016-10-27 10:33:34 +02:00
Jan Christoph Uhde 1ff2bc068e Squashed commit of the following:
commit a72b49c416dd2c78dbd0d9a67b503bdac49e342d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 27 09:21:25 2016 +0200

    remove description that is now in a google docs document

commit 19274465ced67796b166b24bbacc79189b5ee24d
Merge: 09e67e1 5b818c3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 27 09:14:29 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into request_statistics

    * 'devel' of github.com:arangodb/arangodb: (36 commits)
      enable switching from http to vst fix vst authentication
      Fix failing swagger test
      Foxx release notes
      Implement inline middleware
      comment out install targets since we don't want to ship curl binaries
      don't log velocypack output by default, as it may have side-effects
      fix sanitation of externals
      attempt to use less memory
      Do not build curl exec
      remove useless semicolons
      fixed windows compile errors
      Add chapter on Foxx testing
      Don't load mocha QUnit interface
      No more demeter chains...canUseDatabase implemented on AuthenticationFeature level
      allow working with empty bodies
      performance optimization
      Adding new examples
      Added agency to feature list
      Add scripts route to Foxx API
      cause of occasional aardvard not starting up still unclear
      ...

commit 09e67e1fea153388eb81153d735473991d34b12f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 26 09:39:16 2016 +0200

    start to add documentation

commit 747fc3a6905bf4460a40db9322c6dbd3336552c7
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 25 14:30:03 2016 +0200

    avoid negaitve statistics
2016-10-27 09:26:18 +02:00