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

33343 Commits

Author SHA1 Message Date
Jan Christoph Uhde d0fdfa727a Merge branch 'generic-col-types' of github.com:arangodb/arangodb into obi-velocystream 
* 'generic-col-types' of github.com:arangodb/arangodb:
  Improve version handling in ClusterInfo.
  Add further logging where a bug is likely.
  make error message unambiguous

Conflicts:
	lib/Rest/HttpResponse.cpp
 2016-09-05 16:42:41 +02:00
Jan Christoph Uhde 4c473753b7 begin to fix RestReplicationHandler 2016-09-05 16:39:42 +02:00
Jan Christoph Uhde 6a3d6e080b remove comments 2016-09-05 16:39:05 +02:00
Max Neunhoeffer 49d7cf345f Improve version handling in ClusterInfo. 2016-09-05 16:03:28 +02:00
Jan Christoph Uhde cbd8ce615a make use of requested content type 2016-09-05 15:32:56 +02:00
Jan Christoph Uhde f78e54ec8d delete build script 2016-09-05 14:16:12 +02:00
Jan Christoph Uhde 1a66878e16 remove .obi 2016-09-05 14:12:25 +02:00
Max Neunhoeffer ea82514b5e Merge branch 'generic-col-types' of ssh://github.com/ArangoDB/ArangoDB into generic-col-types 2016-09-05 14:07:00 +02:00
Max Neunhoeffer 6da79bf031 Merge branch 'generic-col-types' of ssh://github.com/ArangoDB/ArangoDB into generic-col-types 2016-09-05 14:06:54 +02:00
jsteemann f573f188dc Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 14:02:57 +02:00
Max Neunhoeffer 2543091b7c Add further logging where a bug is likely. 2016-09-05 14:00:25 +02:00
jsteemann f5f5c773e4 make error message unambiguous 2016-09-05 13:55:04 +02:00
Jan Christoph Uhde a53554dcd4 Merge remote-tracking branch 'origin/generic-col-types' into obi-velocystream 
* origin/generic-col-types: (124 commits)
  fixed invalid read
  fixed index creation & validation
  Added missing classes
  micro optimizations
  Added a try catch in loadPlan. If the agency for some reason contains invalid collection information the coordinator will not break down, instead it will ignore the invalid collection and continue.
  looks good for dangling creation of shards
  respond with proper error message in case queue is full
  fix invalid check
  fixed figures() call
  half way through unassumed leadership
  prealloc _readBuffer
  fixed compile warning
  work less on the heap
  removed unused error codes
  removed TRI_collection_t
  removed bug into failedserver
  Create apps directory before starting the instance.
  Add instance info & port sniffing template
  fixed issue #2034
  privatized some members
  ...

Conflicts:
	lib/Rest/HttpResponse.cpp
 2016-09-05 13:29:39 +02:00
Jan Christoph Uhde 7ffa6ae9db fix invalid pointer 2016-09-05 12:12:29 +02:00
Jan Christoph Uhde dd500d9b9f fix warning 2016-09-05 12:07:42 +02:00
jsteemann 62718e0962 fixed invalid read 2016-09-05 12:03:43 +02:00
Jan Christoph Uhde 5fcef4803f try to fix error that occured with fox 2016-09-05 11:57:39 +02:00
jsteemann df808cd665 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:51:09 +02:00
jsteemann cf1023eb98 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:42:58 +02:00
jsteemann 7e04cb07df fixed index creation & validation 2016-09-05 11:42:44 +02:00
jsteemann 43db27d527 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:42:13 +02:00
Kaveh Vahedipour 682a99a063 Added missing classes 2016-09-05 11:15:47 +02:00
jsteemann e468a51ad2 micro optimizations 2016-09-05 11:14:17 +02:00
Michael Hackstein decb4b69a3 Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-09-05 11:04:12 +02:00
Michael Hackstein e5e28f9c08 Added a try catch in loadPlan. If the agency for some reason contains invalid collection information the coordinator will not break down, instead it will ignore the invalid collection and continue. 2016-09-05 11:03:59 +02:00
Kaveh Vahedipour f066ff9920 looks good for dangling creation of shards 2016-09-05 11:03:37 +02:00
jsteemann e2d0f4342f respond with proper error message in case queue is full 2016-09-05 11:02:11 +02:00
jsteemann d1adb02fa6 fix invalid check 2016-09-05 11:01:56 +02:00
Jan Christoph Uhde e1fac75bbf changes in import handler 2016-09-05 10:48:51 +02:00
jsteemann 1361b85837 fixed figures() call 2016-09-05 09:15:36 +02:00
Kaveh Vahedipour f0023d70e1 half way through unassumed leadership 2016-09-02 17:38:49 +02:00
jsteemann d419d2606a prealloc _readBuffer 2016-09-02 17:01:43 +02:00
jsteemann 288e5c3c3f fixed compile warning 2016-09-02 16:29:19 +02:00
jsteemann 67de3f7bb2 work less on the heap 2016-09-02 15:51:02 +02:00
jsteemann 5e9cb5c852 removed unused error codes 2016-09-02 15:36:59 +02:00
jsteemann 4492409d5f Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-02 15:23:15 +02:00
jsteemann 1823cff3a9 removed TRI_collection_t 2016-09-02 14:54:13 +02:00
Kaveh Vahedipour c569ce1f1d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-02 14:39:24 +02:00
Kaveh Vahedipour e669de0f70 removed bug into failedserver 2016-09-02 14:39:15 +02:00
Wilfried Goesgens 0bf440ea83 Create apps directory before starting the instance. 2016-09-02 14:19:15 +02:00
Wilfried Goesgens 22c950df9f Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-09-02 14:18:28 +02:00
Wilfried Goesgens 6dd57a6c4c Add instance info & port sniffing template 2016-09-02 14:18:02 +02:00
Jan Steemann c2e667f906 fixed issue #2034 2016-09-02 13:46:03 +02:00
jsteemann 3909103193 privatized some members 2016-09-02 13:10:17 +02:00
Kaveh Vahedipour d6d9d0ade8 minor 2016-09-02 12:59:58 +02:00
Kaveh Vahedipour 1d241224bb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-02 12:40:46 +02:00
Kaveh Vahedipour b3b7d7c907 failed servers are excluded from new shard creation 2016-09-02 12:37:53 +02:00
jsteemann 4839d65b36 moved things out of TRI_collection_t 2016-09-02 11:56:48 +02:00
Wilfried Goesgens 081e419c68 Make failures output last, so if one scrolls up from the end of the run they occur first. 2016-09-02 11:55:07 +02:00
Wilfried Goesgens 69abacdd16 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-09-02 11:54:56 +02:00