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

2590 Commits

Author SHA1 Message Date
Jan Steemann 4cbe5cf69a shutup VC warning 2014-03-06 10:34:00 +01:00
Jan Steemann e968d62367 re-use planId 2014-03-05 15:33:49 +01:00
Esteban Lombeyda e38906dd21 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestHandler/RestPleaseUpgradeHandler.cpp
 2014-03-05 09:12:49 +01:00
Esteban Lombeyda 39b0b759e9 bug fix: compiling error 2014-03-05 09:00:23 +01:00
Jan Steemann 415055705f adjusted documentation 2014-03-04 18:45:56 +01:00
Jan Steemann 5ebdc7d307 fixed "cannot convert value to JSON" error 2014-03-04 16:21:40 +01:00
Max Neunhoeffer 1cb38c6aca Fix compilation under windows. 2014-03-04 08:53:16 +01:00
Jan Steemann c092158891 disable forwarding of expect header 2014-03-03 19:24:26 +01:00
Jan Steemann a4451d3459 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 12:03:51 +01:00
Jan Steemann f5234b0ed6 always return ignoreNull 2014-03-03 12:03:14 +01:00
Frank Celler 79a98c5095 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-03 11:12:14 +01:00
Frank Celler 2e80955b5f removed debug message 2014-03-03 11:12:08 +01:00
Jan Steemann 65bc5dddad documentation 2014-03-03 10:40:29 +01:00
Jan Steemann 8041752f4f documentation 2014-03-03 10:33:29 +01:00
Jan Steemann 1481ceba42 documentation 2014-03-03 10:28:38 +01:00
Jan Steemann 3478c8bc74 cppcheck 2014-03-03 09:12:34 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Jan Steemann be8abb0cc1 allow syncing with 2.0 2014-02-28 22:19:21 +01:00
Jan Steemann 978e784462 disable replication handlers for coordinators 2014-02-28 21:51:02 +01:00
Frank Celler b888e8cfa6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/V8PeriodicJob.cpp
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
 2014-02-28 20:37:05 +01:00
Jan Steemann 0b1dcc0deb include collection in inventory if id is equal to current server tick 2014-02-28 20:00:04 +01:00
Max Neunhoeffer 944f29deb0 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 18:51:24 +01:00
Max Neunhoeffer cb8f0257a7 Give the server state in the agency a time to live. 2014-02-28 18:47:46 +01:00
Jan Steemann 3ca2001c99 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 18:43:36 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Max Neunhoeffer 0a8555fab3 Sort out path to javascript files. 2014-02-28 14:19:04 +01:00
Jan Steemann 4615310e97 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 13:50:56 +01:00
Jan Steemann fd08bb0feb use indexes in AQL 2014-02-28 13:50:39 +01:00
Frank Celler 1aa3a02167 changed default log level to warning 2014-02-28 12:25:30 +01:00
Esteban Lombeyda 85e824f1c8 Bug Fix: compiler error 
: searching strategy for installation directory upgraded
 2014-02-28 12:07:29 +01:00
Frank Celler f22f1525d2 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	etc/relative/arangod.conf
 2014-02-28 12:03:11 +01:00
Frank Celler 9a410a5b71 added config for server state 2014-02-28 12:02:21 +01:00
Jan Steemann 6f26e4fc23 do not pass auth header 2014-02-28 09:12:27 +01:00
Jan Steemann c04377e4cd Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 08:59:48 +01:00
Jan Steemann ed8f52b323 fixed small memleak reported by valgrind 2014-02-27 20:40:49 +01:00
Jan Steemann 8edf96e9aa added documentation for cluster authentication options 2014-02-27 19:27:12 +01:00
Jan Steemann 897d6f4dcd fixed cluster authentication 2014-02-27 17:45:03 +01:00
Jan Steemann a0c554fa22 fixed tests 2014-02-27 14:58:01 +01:00
Jan Steemann 076b8f1029 fixed test 2014-02-27 14:03:23 +01:00
Jan Steemann c387b697e8 fixed test 2014-02-27 13:26:40 +01:00
Jan Steemann a0c32e90d7 fixed edge access in coordinator 2014-02-27 13:14:02 +01:00
Frank Celler 3afa2214f7 added disable-cluster-dispatcher 2014-02-27 11:47:26 +01:00
Frank Celler 710c3c9716 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 09:17:39 +01:00
Jan Steemann ef84dc23e2 fixed segfault 2014-02-27 09:16:07 +01:00
Frank Celler e10bab8059 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 09:16:02 +01:00
Frank Celler 8406f51435 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Ahuacatl/ahuacatl-codegen.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph/traversal.js
	js/common/modules/org/arangodb/graph/traversal.js
	js/server/modules/org/arangodb/ahuacatl.js
	lib/HttpServer/HttpCommTask.h
 2014-02-27 09:13:03 +01:00
Jan Steemann f5269fa3de fixed traversals 2014-02-26 21:28:40 +01:00
Jan Steemann fe74e030ea fixed keygen test 2014-02-26 16:47:38 +01:00
Jan Steemann 08ff8f9237 allowUserKeys method 2014-02-26 16:31:48 +01:00
Jan Steemann 460455d0ed dont clear result 2014-02-26 16:31:23 +01:00