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

714 Commits

Author SHA1 Message Date
Jan Christoph Uhde c31b93647a try to fix RestCursorHandler 2016-08-27 02:01:18 +02:00
Jan Christoph Uhde 3d26df27a0 prepare the fixing of resthandlers 2016-08-27 00:27:07 +02:00
Jan Christoph Uhde 2ba4901b86 fist changes to get request agents working 2016-08-25 13:28:19 +02:00
Jan Christoph Uhde c64ebd6660 fix missing return in control path 2016-08-25 10:36:12 +02:00
Jan Christoph Uhde c67f45a9ce fix adding to array (without keys:) 2016-08-24 16:31:08 +02:00
Jan Christoph Uhde ca433a92fd VPP Header is now and Array instead of Object 2016-08-24 15:51:44 +02:00
Jan Christoph Uhde f9feb14a6e Revert "Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream" 
This reverts commit 76679e1636, reversing
changes made to 5be5030983.

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-24 15:26:49 +02:00
Jan Christoph Uhde e0d914fcc1 Revert "add options to Slice::get and use them for VPackHeader" 
This reverts commit b2f99adaaa.
 2016-08-24 15:11:22 +02:00
Jan Christoph Uhde 76679e1636 Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream 
* obi-velocystream-attribute-translator:
  add options to Slice::get and use them for VPackHeader
  add translator to VelocyPackHelper and headerOption to Vpp Protocol

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
	lib/Rest/CommonDefines.h
 2016-08-24 09:18:35 +02:00
Jan Christoph Uhde 0184399ba7 clean up - remove enumToEnum magic 2016-08-23 15:58:50 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde a6f5fc97de finish ProtocolVersion, ProtocolType and ConnectionType 2016-08-23 15:36:36 +02:00
Jan Christoph Uhde 4873a9be71 finish ContentType enum 2016-08-23 15:02:55 +02:00
Jan Christoph Uhde 140b8dc802 preapre move of ContentTypes 2016-08-23 14:55:34 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
Jan Christoph Uhde ed60eca896 prepare replacement of request types 2016-08-23 14:31:22 +02:00
Jan Christoph Uhde b2f99adaaa add options to Slice::get and use them for VPackHeader 2016-08-23 13:44:10 +02:00
Jan Christoph Uhde 8f5e6f65d6 add translator to VelocyPackHelper and headerOption to Vpp Protocol 2016-08-23 13:05:50 +02:00
Jan Christoph Uhde 86f887db92 even more error messages 2016-08-23 09:33:03 +02:00
Jan Christoph Uhde e2d41278af slightly better error messages 2016-08-22 09:18:35 +02:00
Mark 3bd5c27c0c changes for Visual Studio 2016-08-19 17:22:57 +02:00
Jan Christoph Uhde e1e7e2da0b Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream-merge 
* origin/engine-vs-velocystream: (91 commits)
  removed useless include
  removed JsonParser
  removed JsonHelper
  Fixed another failed nullptr handling in LogicalCollection cluster case.
  Fixed undefined behaviour in rest error creation
  Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode
  agency startup changed to bootstrapping
  Mention howto control core files on linux.
  shutdown fixed
  Removed create / drop system collection from Cluster test. This is forbidden now
  The logical colleciton now knows it's journalSize
  Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again.
  pushing corrected unittest script and cluster startup scripts
  adjusting startup scripts
  missing source file added
  we have a bootstrapping agency
  votes are processed correctly again
  Add module.context.createDocumentationRouter
  Don't implicitely build the windows packages.
  remove debug print
  ...

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	arangod/GeneralServer/VppCommTask.h
	arangod/RestHandler/RestBaseHandler.cpp
	lib/Rest/VppRequest.h
 2016-08-19 14:35:05 +02:00
Jan Christoph Uhde 5a236bbade fix number of payloads 2016-08-19 13:52:46 +02:00
Michael Hackstein 96f11c7e9f Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-19 12:26:07 +02:00
jsteemann 6580131731 Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-19 12:19:05 +02:00
jsteemann c5f151da5c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-19 11:01:15 +02:00
Jan Christoph Uhde 61cb8f561f Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream 
* origin/obi-velocystream-frank:
  fixed ownership of handler

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-19 09:58:27 +02:00
Jan Christoph Uhde 9ba13e757c prepare response for multiple velocypacks 2016-08-19 09:38:35 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
Wilfried Goesgens dadd9833d1 Implement detection whether we are in a git repo and use the toplevel source dir. 2016-08-18 17:53:47 +02:00
Michael Hackstein 54fa504cc2 Fixed compile warning 2016-08-18 12:38:58 +02:00
Jan Christoph Uhde 4d80deebbf Merge remote-tracking branch 'origin/obi-velocystream' into obi-velocystream-test 
* origin/obi-velocystream:
  must lower case header keys
 2016-08-18 11:45:04 +02:00
Jan Christoph Uhde e5794ac583 enable handling of multiple vpacks in a message 2016-08-18 11:44:03 +02:00
jsteemann ca60690b66 must lower case header keys 2016-08-18 09:01:16 +02:00
Jan Christoph Uhde 3fb68c632d handleSimpleError now respects messageId 2016-08-17 13:22:31 +02:00
Jan Christoph Uhde 21a9f64538 remove: _request from CommTask and contentType from setPayload() 2016-08-17 09:29:23 +02:00
Jan Christoph Uhde dfb9e3ae0c Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream 
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (71 commits)
  jslint
  finally fixed some nasty bugs after refactoring
  jslint
  Update README.md
  execute ternary operator in C++ as well
  added libs
  added libs
  added build
  upgraded to boost 1.61.0
  Tweak Aardvark's SUPPORT > Documentation tab
  Docs: Data model -> Data models, note that NOT_NULL() is equal to SQL's COALESCE()
  Correct HTTP docs about user parameters
  generated files
  Fix testing
  Proper roles of servers
  Streamline agency testing
  Fix if
  Fix testing
  Improve clusterawareness in foxx and foxx queues
  Add test because of keysorting bugfix
  ...
 2016-08-15 15:18:54 +02:00
Jan Christoph Uhde 21144a37c4 try to fix simple route 2016-08-15 12:51:28 +02:00
Jan Christoph Uhde 61e384e8f2 Merge remote-tracking branch 'origin/engine-vs-velocystream' into merge_jans 
* origin/engine-vs-velocystream: (54 commits)
  Fix testing
  Proper roles of servers
  Streamline agency testing
  Fix if
  Fix testing
  Improve clusterawareness in foxx and foxx queues
  Add test because of keysorting bugfix
  Couldn't query two different keys beginning with the same string in one level
  Add download and slack buttons to documentation header
  gv
  Adjustment for Repository Version
  Adjustment for Repository Version
  Adjustment for Repository Version
  Update build-repository.h.in
  improved gv
  Create build-repository.h.in
  queryView bugfix
  grunt build
  improved gv, added limit
  improved gv
  ...
 2016-08-15 08:51:38 +02:00
Jan Christoph Uhde e62b4f69d6 add better logging and clean up code 2016-08-12 15:05:03 +02:00
Jan Christoph Uhde 3d4e1f6922 clean up code 2016-08-11 16:44:12 +02:00
Jan Christoph Uhde a1d6909f88 make use of generateBody in payload and fix some bugs in VppCommTask 2016-08-11 13:20:58 +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
Jan Christoph Uhde b3fab8c618 fix header 2016-08-11 09:03:34 +02:00
Jan Christoph Uhde da0c40cff7 server should now reply 2016-08-10 11:11:26 +02:00
Jan Christoph Uhde 8f6ff64d00 fix errors in vpp protocol 2016-08-09 19:09:24 +02:00
servusoft 7315777bc2 Adjustment for Repository Version 2016-08-09 14:05:34 +02:00
servusoft 1a13206b65 Adjustment for Repository Version 2016-08-09 14:00:03 +02:00
Jan Christoph Uhde 0e5b455159 setPayload of response now takes contType instead of request 2016-08-08 14:48:56 +02:00
Jan Christoph Uhde 655e45a19a rename functions to be compliant with coding conventions 2016-08-05 18:20:10 +02:00
Jan Christoph Uhde ed0fc2e83d do not overwrite CUSTOM ContentType 2016-08-05 12:32:45 +02:00
Jan Christoph Uhde 65e5d4e6ac fix handling of content type 2016-08-05 12:25:29 +02:00
Jan Christoph Uhde 50fe64d6ca convert contentTypes 2016-08-04 16:42:30 +02:00
Jan Christoph Uhde 3c4db6783c update test 2016-08-04 15:02:04 +02:00
Jan Christoph Uhde 01c1c09d5a add first vpack test -- content type has to be fixed first 2016-08-04 13:32:25 +02:00
Jan Christoph Uhde 54eda61754 connect response to CommTask WriteBuffers 2016-08-03 16:08:04 +02:00
Jan Christoph Uhde cb275e239f add: clean buffer for VppCommTask 2016-08-03 09:20:22 +02:00
Jan Christoph Uhde 05b8995bbf update VppRequest 2016-08-02 13:45:49 +02:00
Jan Christoph Uhde 25226b1459 add: header() / headers() implemented for VppRequest 2016-08-02 11:36:06 +02:00
jsteemann 3c8f644c2d fix cluster communication 2016-08-01 17:13:00 +02:00
Jan Christoph Uhde c59a553723 fix some errors -- http tests failing in cluster 2016-08-01 15:19:11 +02:00
Jan Christoph Uhde 29a87ef109 fix move 2016-08-01 12:37:01 +02:00
Jan Christoph Uhde ef12d8dc2c struggle with ctor 2016-08-01 11:48:30 +02:00
Jan Christoph Uhde 732c182388 fix building 2016-07-27 12:08:07 +02:00
Jan Christoph Uhde 59ec4bf83b enable VPACK 2016-07-27 09:12:28 +02:00
Jan Christoph Uhde 4c37db381a get rid fo cookies in non-http requests 2016-07-26 10:38:34 +02:00
Jan Christoph Uhde da81c32539 remove body() method from GeneralRequest 2016-07-25 16:46:53 +02:00
Jan Christoph Uhde ef6643e8b4 add: VppResponse 2016-07-25 16:06:33 +02:00
Jan Christoph Uhde 0e25dca075 add: VppRequest 2016-07-25 14:22:25 +02:00
Jan Christoph Uhde 5edaf0043a preparations for velocystream completed 2016-07-21 09:32:00 +02:00
Max Neunhoeffer 6f4b48cfcf Try to fix performance issue with single documents in cluster. 
This creates a fast path in performRequests for the case that only
one request is given. We use syncRequest instead of asyncRequest
to save a network roundtrip. Furthermore, all queues and locks
in ClusterComm are circumvented.
 2016-07-20 15:15:41 -07:00
Jan Christoph Uhde 6f39b389c3 fix: initialize variables in Base class 2016-07-20 09:10:16 +00:00
Jan Christoph Uhde 06bd01695a removed: body() from GeneralRequest 2016-07-19 09:16:07 +02:00
Jan Christoph Uhde 002a1e55cb add: payload/addPayload methods 2016-07-18 13:16:08 +02:00
Jan Christoph Uhde beae8a8f74 first changes for set/get payload methods -> 
toVelocyPack now returns slices
 2016-07-15 16:38:13 +02:00
Jan Christoph Uhde 682cf7a2f1 virtualize functions of request/response 2016-07-14 08:40:05 +02:00
Frank Celler a8e29450f4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:13:38 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
jsteemann 9593ac122d dont include unused StringBuffer 2016-07-04 15:00:08 +02:00
jsteemann ee492c67e8 add info about assertions 2016-06-15 22:36:05 +02:00
Frank Celler 8dd9ce47a0 fixed // and /./ handling 2016-06-12 23:36:13 +02:00
Frank Celler f65393394a fixed double // 2016-06-10 16:36:09 +02:00
Frank Celler 927c697b8b fixed auth (again) 2016-06-10 16:21:48 +02:00
jsteemann 325aa13795 merge with velocypack 2016-06-06 16:59:36 +02:00
Frank Celler 1e25e5d262 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Cluster/HeartbeatThread.cpp
	arangod/RestServer/RestServerFeature.cpp
 2016-06-01 16:25:13 +02:00
Frank Celler 963449d5f7 WIP 2016-06-01 13:37:13 +02:00
Jan Steemann 66c0385fe0 added RocksDB version information, fixed comparator 2016-05-27 12:58:26 +02:00
Frank Celler c441700c20 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-05-22 21:45:40 +02:00
Frank Celler af0b0900af WIP 2016-05-22 21:08:37 +02:00
Frank Celler 806fce1dec WIP 2016-05-21 21:58:42 +02:00
Max Neunhoeffer e0d596e6dc Fix a crash in RestShardHandler. 2016-05-19 16:47:53 +02:00
Frank Celler 9dbba248de added fillBody 2016-05-13 15:14:44 +02:00
jsteemann 07aa8b4dac more version info 2016-05-12 11:11:31 +02:00
jsteemann 130493d481 micro optimizations 2016-05-11 21:02:20 +02:00
Frank Celler bf16086623 moved SSL files into separate directory 2016-05-11 16:34:03 +02:00
jsteemann 3f1516eca7 bugfixes 2016-05-11 15:01:06 +02:00
jsteemann 98f0ad81a6 micro optimizations 2016-05-11 14:06:47 +02:00
jsteemann bfd5596359 optimizations 2016-05-11 11:50:07 +02:00
jsteemann 0ce8599598 fixes for MSVC 2016-05-10 19:01:21 +02:00
jsteemann 61be9321a7 removed unused code 2016-05-10 16:04:10 +02:00
jsteemann f90a9fce18 handle "Connection" and "Content-Type" headers separately 2016-05-10 15:24:55 +02:00
jsteemann 57bc554d9a cppcheck 2016-05-07 07:55:57 +02:00
Jan Steemann 0bd61cf928 removed option `--server.default-api-compatibility` 2016-05-06 18:38:37 +02:00
jsteemann 96fceb4411 use std::unordered_maps for headers 2016-05-01 20:52:47 +02:00
jsteemann 0dc068a5be Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-01 00:07:55 +02:00
jsteemann 1250fcf63e micro optimizations 2016-05-01 00:03:23 +02:00
Frank Celler 603aa4bfde removed unused code 2016-04-30 21:00:24 +02:00
jsteemann 46fc8a25d4 micro optimizations 2016-04-28 15:41:50 +02:00
jsteemann 348e1e3397 client tools simplifications and fixes 2016-04-25 22:28:43 +02:00
jsteemann 2f6510689b removed unused JSON functionality 2016-04-24 18:48:10 +02:00
jsteemann 4b7e0a72d0 moved --version into a feature of its own 2016-04-24 18:42:59 +02:00
Frank Celler d6e8046992 updated cleanupCFiles 2016-04-23 16:34:57 -07:00
Jan Steemann 143c2378af fixed leak 2016-04-22 13:01:32 +02:00
Frank Celler 5335a5b0af moved to Random 2016-04-21 22:53:20 -07:00
Wilfried Goesgens 51bca63463 Add detection for jemalloc, default to using jemalloc on linux. 2016-04-21 18:22:52 +02:00
Frank Celler 29e0ec4465 added missing initialization 2016-04-17 00:01:49 +02:00
Frank Celler dd44191a91 WIP 2016-04-15 21:03:53 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Jan Steemann ac99d29dd4 fixed misusage 2016-04-07 16:39:53 +02:00
Jan Steemann 4b0c01975b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 14:30:36 +02:00
Frank Celler f6c818a399 removed tolower for NC 2016-04-07 14:15:30 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Jan Steemann d8b993f0fb fixed some issues with tests 2016-04-04 10:47:04 +02:00
Jan Steemann 9f213281b1 fixed some issues with tests 2016-04-04 10:13:13 +02:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Frank Celler e536234aae bound check 2016-04-01 12:26:46 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Frank Celler 295c8a3809 MSVC fixes 2016-03-31 14:01:23 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Frank Celler 9095e57fb3 fixed tcmalloc test 2016-03-28 22:08:28 +02:00
Jan Steemann cda0646c83 removed unused error codes 2016-03-24 17:04:58 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Kaveh Vahedipour 90a085975d missing overrides 2016-03-23 17:39:16 +01:00
Jan Steemann 9ac39b7ad6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:30 +01:00
Frank Celler 86fe838a68 new logger 2016-03-22 21:09:48 +01:00
jsteemann 145e6598b9 add more version information 2016-03-21 22:58:52 +01:00
jsteemann 9fcc5d043b removed superfluous includes 2016-03-21 22:58:42 +01:00
jsteemann 268a2e4a62 removed unused code 2016-03-21 21:07:59 +01:00
jsteemann 4694d36671 cppcheck 2016-03-21 20:56:08 +01:00
jsteemann fd49f750fb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 10:46:03 +01:00
Kaveh Vahedipour d6db18d655 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-18 10:45:15 +01:00
Wilfried Goesgens ddea85ff44 RestEndpointServer is unavailable on windows. 2016-03-17 23:32:25 +01:00
jsteemann 171488b6d2 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 23:34:29 +01:00
Andreas Streichardt 614beefc74 Throw Http error 503 when a required backend is unavailable 2016-03-16 18:04:05 +00:00
Kaveh Vahedipour 7355cde795 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-16 16:27:53 +01:00
jsteemann 661aec8973 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-15 23:45:16 +01:00
jsteemann 2ceecda5f7 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-15 23:44:42 +01:00
Frank Celler ee7ad9efd1 switch to GETLONG 2016-03-15 23:44:00 +01:00
Frank Celler d64bf2dc95 added srv:// endpoint 2016-03-15 23:25:07 +01:00
jsteemann 3a6e618a30 micro optimizations 2016-03-15 12:28:58 +01:00
Kaveh Vahedipour 61a55d61db Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-10 17:37:43 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Kaveh Vahedipour df56885c09 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-07 17:38:38 +01:00
Jan Steemann 9f84b767d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 08:11:01 +01:00
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
Kaveh Vahedipour 0ac54c3300 agency on 2016-02-26 17:44:14 +01:00
Jan Steemann c0fd3b13ca Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-26 10:19:17 +01:00
Max Neunhoeffer 7c2979275d Fix a defined around SSL. 2016-02-26 08:53:59 +00:00
Kaveh Vahedipour 34976d462f agency on 2016-02-26 09:31:05 +01:00
Frank Celler 06256947fa splitted into 3rd libs 2016-02-25 18:51:17 +01:00
Jan Steemann 3e82064770 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:59:08 +01:00
Frank Celler 37a0a7fc05 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 10:56:14 +01:00
jsteemann 74fa6cf207 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 00:02:03 +01:00
jsteemann b3a20e915f simplified some logging 2016-02-24 22:48:56 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Kaveh Vahedipour 86be0136ec agency on 2016-02-24 18:26:32 +01:00
Frank Celler 43be85e72b more cleanup 2016-02-24 10:30:30 +01:00
Frank Celler 8f747d9496 switch to ARANGODB_ZLIB_VERSION 2016-02-23 15:28:31 +01:00
Frank Celler d53b65a2f8 cleanup of OS defines 2016-02-23 15:27:34 +01:00
Frank Celler 6fa4e319bb simplified init 2016-02-23 15:26:22 +01:00
Jan Steemann 70d44f06fa Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 13:22:46 +01:00
Frank Celler e269b97517 cleanup of OS defines 2016-02-23 12:26:10 +01:00
Frank Celler ef71f52a24 simplified init 2016-02-23 12:26:10 +01:00
Kaveh Vahedipour 1f9414f3ea Agencing on 2016-02-19 18:58:53 +01:00
Wilfried Goesgens acc17daa96 Merge branch 'devel-solaris' of https://github.com/doublerebel/arangodb into doublerebel-devel-solaris 
Fix Conflicts:
	arangod/FulltextIndex/fulltext-index.cpp
	lib/Basics/logging.cpp
 2016-02-04 15:11:34 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
jsteemann ae25d2b53b removed `using namespace std` 2016-01-31 18:22:00 +01:00
jsteemann 2d7323a560 fixed warnings shown by clang-3.7 2016-01-31 02:17:36 +01:00
jsteemann 9482ee1cca use Logger 2016-01-30 00:08:35 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Charles Phillips 0b2d10a603 fix,solaris: invalid conversion from 'unsigned int' to 'void*' ptr 2016-01-25 23:29:04 -08:00
Michael Hackstein a6f58ce14d Use forward declarations for VelocyPack instead of all includes everywhere 2016-01-24 14:29:31 +01:00
jsteemann 79d57bf74e added VPack version number 2016-01-21 01:04:51 +01:00
jsteemann ef67a496e6 more checks & asserts, C API cleanup 2016-01-20 22:08:11 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
jsteemann 81cbbee354 added HTTP response code 451 2016-01-17 00:26:59 +01:00
jsteemann 1b959c827d more const unification 2016-01-15 00:09:52 +01:00
Frank Celler 89ca0ffae1 added work monitor call 2016-01-13 18:10:51 +01:00
Jan Steemann 687d6133f0 comments reformatting 2016-01-11 09:52:39 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
jsteemann 50c0e18d53 removed useless con|destructor comments 2016-01-07 21:19:53 +01:00
jsteemann 0bfc9a19ae BE -> AE 2016-01-07 21:09:33 +01:00
Jan Steemann 8b4b6a1943 moved docu blocks into their own files 2016-01-07 16:03:17 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann 9a1d7959e9 merged string-buffer.h and StringBuffer.h 2016-01-06 13:24:09 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00