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

10525 Commits

Author SHA1 Message Date
jsteemann ebaabdb076 Merge branch 'obi-velocystream-4' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-07-28 16:11:26 +02:00
jsteemann b48779c821 fixed tests 2016-07-28 15:56:38 +02:00
Jan Christoph Uhde fa0015e658 add: implemented part of VppCommTask 2016-07-28 13:58:51 +02:00
jsteemann 329b733090 moved dropCollection into TRI_vocbase_t 2016-07-28 13:14:12 +02:00
jsteemann be8df652b7 make ctor explicit 2016-07-28 12:06:22 +02:00
jsteemann 45f775e56f removed unused consts 2016-07-28 12:04:03 +02:00
jsteemann b3bdd3a66a more refactoring 2016-07-28 11:47:20 +02:00
jsteemann b71e12f6a0 some vocbase refactoring 2016-07-28 11:06:21 +02:00
jsteemann cc5eaea09c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-28 09:10:17 +02:00
Frank Celler 24db83573a added thread affinity for MacOSX 2016-07-27 22:29:59 +02:00
jsteemann 5d6cd9ef71 moved query id generation 2016-07-27 17:44:31 +02:00
jsteemann 31407c3561 refactoring 2016-07-27 17:15:52 +02:00
jsteemann 314a6f6c29 reactivate TickIterator 2016-07-27 16:04:22 +02:00
jsteemann 55eda66d4a Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-27 15:57:56 +02:00
jsteemann 10a60b5458 refactoring 2016-07-27 15:40:25 +02:00
Jan Christoph Uhde 36167b8e17 Merge remote-tracking branch 'origin/devel' into obi-velocystream-4 
* origin/devel: (23 commits)
  Fix trusted origin tests
  Fix CORS with credentials
  New version of script.
  updated CHANGELOG
  grunt build [ci skip]
  improved gv
  added expand function to gv
  enable: compile_commands.json
  semistandard fix
  improved gv
  gv bugfix
  updated license
  improved gv
  Adapting to 64 bit ARM architecture (aarch64) at the exceptions for TRI_PADDING_32
  improved gv performance
  fix handling of empty query strings
  fixed query editor issues
  Modularize perf script.
  Add one more event.
  Add a first perf probe monitoring script.
  ...

Conflicts:
	arangod/GeneralServer/HttpCommTask.cpp
 2016-07-27 13:25:34 +02:00
jsteemann 26ce0c6936 some collection handling refactoring 2016-07-27 13:12:26 +02:00
Jan Christoph Uhde 732c182388 fix building 2016-07-27 12:08:07 +02:00
Jan Christoph Uhde 3f57335fe4 with error 2016-07-27 11:48:21 +02:00
Andreas Streichardt 5fe3274000 Fix CORS with credentials 2016-07-27 11:25:46 +02:00
Jan Christoph Uhde 9965ca9c6a Merge branch 'obi-velocystream-2' into obi-velocystream-3 
* obi-velocystream-2: (21 commits)
  enable VPACK
  add some documentation
  add some documenation
  get rid fo cookies in non-http requests
  Documentation improvements
  Docs: Fix locking and isolation code examples (require db object and use AQL traversal)
  fix recovery edge case
  grunt build [ci skip]
  added edge hover event
  redirect to new gv
  ui added query execution of selected text
  gv improvements
  removed unused code path
  added convenience method getRegister()
  remove body() method from GeneralRequest
  Removing unnecessary library "z" by cross-compiling
  Adaptation of V8 architecture "arm64" with "aarch64" processor.
  Complete to __aarch64__ achritectur
  add: VppResponse
  cppcheck
  ...

Conflicts:
	arangod/GeneralServer/GeneralCommTask.cpp
	arangod/GeneralServer/GeneralCommTask.h
	arangod/GeneralServer/HttpCommTask.h
 2016-07-27 10:11:50 +02:00
Frank Celler e008a3b306 moved accessControlAllowOrigins to GeneralServerFeature 2016-07-27 09:09:07 +02:00
Frank Celler 078457c302 cleanup of calls 2016-07-26 17:20:14 +02:00
jsteemann 008fc46dfc Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-26 16:25:50 +02:00
jsteemann 89e0c11b44 refactoring 2016-07-26 16:25:38 +02:00
Jan Steemann c879761d15 fix handling of empty query strings 2016-07-26 16:18:15 +02:00
Jan Christoph Uhde d93b709b4f add some documentation 2016-07-26 13:51:56 +02:00
jsteemann df4daf4122 CleanupThread is now derived from Thread 2016-07-26 12:54:08 +02:00
Jan Christoph Uhde c17d6d0e3a add some documenation 2016-07-26 11:43:01 +02:00
Jan Christoph Uhde 96772223df Merge branch 'devel' of github.com:arangodb/arangodb into obi-velocystream-2 
* 'devel' of github.com:arangodb/arangodb:
  Documentation improvements
  Docs: Fix locking and isolation code examples (require db object and use AQL traversal)
  fix recovery edge case
  grunt build [ci skip]
  added edge hover event
  redirect to new gv
  ui added query execution of selected text
  gv improvements
  removed unused code path
  added convenience method getRegister()
  Removing unnecessary library "z" by cross-compiling
  Adaptation of V8 architecture "arm64" with "aarch64" processor.
 2016-07-26 10:39:24 +02:00
Jan Christoph Uhde 4c37db381a get rid fo cookies in non-http requests 2016-07-26 10:38:34 +02:00
jsteemann 9af8a30a36 fixed compactor locks 2016-07-26 10:22:44 +02:00
jsteemann b54f0a15d8 removed last occurrence of TRI_vector_t in arangod 2016-07-26 08:04:30 +02:00
jsteemann 253cb173a9 cleanup compaction responsibility a little bit 2016-07-26 07:34:02 +02:00
jsteemann 2c88ac61d3 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 17:58:02 +02:00
jsteemann d6baadf59a fix recovery edge case 2016-07-25 17:57:25 +02:00
jsteemann 9e2b75de7d refactoring 2016-07-25 17:31:16 +02:00
jsteemann 0113c78712 use function object 2016-07-25 17:22:41 +02:00
jsteemann 2d293261cc Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 16:54:12 +02:00
jsteemann fe99ca558a removed unused code path 2016-07-25 16:52:39 +02:00
jsteemann d3946a5f3c added convenience method getRegister() 2016-07-25 16:52:27 +02:00
jsteemann 2aa2e0dab4 removed server.h 2016-07-25 16:49:52 +02:00
Jan Christoph Uhde 61323d4ddc Merge branch 'devel' of github.com:arangodb/arangodb into obi-velocystream-2 
* 'devel' of github.com:arangodb/arangodb:
  Complete to __aarch64__ achritectur
  cppcheck
  gv improvement + bugfix
  initialize all instance variables
  updated CHANGELOG
  issue #1962
  issue #1959
  fixed exporting documents webui
  set GYP_CROSSCOMPILE by  CROSS_COMPILING
 2016-07-25 16:47:50 +02:00
Jan Christoph Uhde da81c32539 remove body() method from GeneralRequest 2016-07-25 16:46:53 +02:00
jsteemann fe3f89fe6b Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 16:45:00 +02:00
Frank Celler 23d7fc7247 moved startThread from HttpCommTask to RestHandler 2016-07-25 16:40:29 +02:00
jsteemann 50f3dcfb3f cleanup 2016-07-25 16:16:07 +02:00
jsteemann 158f21b0da cppcheck 2016-07-25 16:00:27 +02:00
jsteemann 6a480c0214 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 15:48:57 +02:00
jsteemann a0f0055b6f moved all database management functions into DatabaseFeature 2016-07-25 15:48:37 +02:00