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

407 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Frank Celler 1065a1bd2c added work monitor 2016-01-04 15:33:06 +01:00
Frank Celler b44c7ab64c Darwin fixes 2016-01-03 12:46:06 +01:00
Jan Steemann 22b4524ba6 issue #1626: fix HTTP status return codes for several error codes 2015-12-23 21:57:45 +01:00
Max Neunhoeffer 0743885dec Fix handling of VPackOptions in Parser/Builder usage. 
Also fix TRI_json_t* handling for cluster methods.
 2015-12-18 20:42:59 +01:00
Michael Hackstein acadb089ee Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-09 10:29:13 +01:00
jsteemann c99f4244c7 bugfix for cluster edges API 2015-12-09 00:26:18 +01:00
Michael Hackstein ad0697446a Allow to pass in the ParserOptions for request to velocyPack 2015-12-07 14:20:20 +01:00