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

1099 Commits

Author SHA1 Message Date
jsteemann 0da9ac7cdc micro optimizations 2016-04-23 16:23:15 +02:00
Jan Steemann 104e8e8b9b remove ArangoServer.h remainders 2016-04-22 20:18:28 +02:00
Jan Steemann 38e543e0a8 cppcheck 2016-04-22 15:51:03 +02:00
Jan Steemann 7d6994862e fixed startup/shutdown with specific features 2016-04-22 14:44:42 +02:00
jsteemann ad0a3f38b0 allow accessing /_admin/log in all databases 2016-04-22 08:41:39 +02:00
Frank Celler ac3a9883b9 restored log buffer feature 2016-04-21 21:07:23 -07:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Jan Steemann 240cb95f0c fixed crash 2016-04-19 15:54:10 +02:00
Michael Hackstein be118b1b80 Former JsonCursor now uses QueryResult and contains the TRX context for continuuos reads 2016-04-19 14:32:23 +02:00
Frank Celler 75d3de2b31 fixed merge 2016-04-19 07:52:02 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
 2016-04-19 07:44:00 +02:00
Kaveh Vahedipour 313140e0e1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 15:27:31 +02:00
Michael Hackstein 94ee7b41f8 Removed unneccessary warning 2016-04-18 13:44:11 +02:00
Kaveh Vahedipour 1221326753 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 13:08:56 +02:00
Kaveh Vahedipour 76a0b2d41a cluster startup and supervision 2016-04-18 13:08:49 +02:00
Michael Hackstein 4cf47bf9c4 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-18 12:42:00 +02:00
Michael Hackstein ca64e727a1 Entirely removed TRI_json_t and Json from ClusterMethods and RestEdgesHandler 2016-04-16 23:23:25 +02:00
Michael Hackstein 1c040696b4 Removed unnecessary TRI_json_t in RestReplicationHandler 2016-04-16 22:37:48 +02:00
Frank Celler 2dd798cd48 WIP 2016-04-15 22:09:55 -07:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07: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
Michael Hackstein cd12a07a4d Fixed return codes in cluster. They are now forwarded properly from DBServer to Client 2016-04-15 17:58:06 +02:00
Jan Steemann bbfaee3bfe allow specifying collection name prefixes for `_from` and `_to` in arangoimp: 2016-04-15 16:18:23 +02:00
Michael Hackstein 0e2d31f633 Moved GET _api/document?collection=xxx to PUT _api/simple/all-keys {collection: xxx}. Adapted all tests. Also removed Transaction::allKeys which got obsolete by this commit. 2016-04-15 11:23:25 +02:00
Frank Celler 8254bd4bd6 WIP 2016-04-14 21:32:12 -07:00
Michael Hackstein 9d26149187 RestHandler now reacts to NOT_ALL_SHARDING_ATTRIBUTES_GIVEN. This could not occur before. 2016-04-14 10:23:11 +02:00
Frank Celler 0fa6435731 WIP 2016-04-13 21:12:16 +02:00
Michael Hackstein a14d7dffe2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-13 08:30:48 +02:00
Jan Steemann d0296b38e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 18:27:53 +02:00
Jan 7cd428c367 Merge pull request #1798 from ObiWahn/devel 
optional velocypack response
 2016-04-12 18:27:08 +02:00
Jan Steemann c0fd5c5f78 removal of some JSON 2016-04-12 18:21:11 +02:00
Kaveh Vahedipour 9bd08b98c4 correct callback jsons 2016-04-12 16:01:00 +02:00
Kaveh Vahedipour b44af0ab60 new simple URI form from endpoint 2016-04-12 14:20:47 +02:00
Michael Hackstein 50535f6ad8 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-12 14:12:06 +02:00
Kaveh Vahedipour 0efa889f43 new simple URI form from endpoint 2016-04-12 14:10:18 +02:00
Kaveh Vahedipour 9853b9662c introducing cluster sanity checking to agency 2016-04-12 12:10:46 +02:00
Michael Hackstein 19a861e86d Modify Document now returns X-Arango-Error-Codes header in baby case. 2016-04-11 14:23:03 +02:00
Michael Hackstein 83b13bb8b3 Implemented modifyDocument in cluster with babies. 2016-04-11 10:25:03 +02:00
Jan Christoph Uhde 1977377cc6 prepare two more functions to return velocypack - please review 2016-04-11 01:19:24 +02:00
Jan Christoph Uhde 1d72053587 reviewed by jan 2016-04-10 10:42:56 +02:00
Kaveh Vahedipour c949df2dfc agency compiles after pull from devel 2016-04-08 12:40:38 +00:00
Jan Christoph Uhde c3c403532b client is now able to request velocypack 2016-04-08 13:29:27 +02:00
Jan Steemann e37029aec6 removed unused private variable 2016-04-07 18:52:32 +02:00
Jan Steemann 1855b74aaa added asserts 2016-04-07 16:44:36 +02:00
Jan Steemann 74794d16db Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 14:43:35 +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 513dc26fc1 make replication tests more deterministic 2016-04-07 13:00:30 +02:00
Michael Hackstein 015c5d2908 Fixed single-server babies test. Also made sure that the error header is capialized properly 2016-04-07 12:41:23 +02:00