1
0
Fork 0
Commit Graph

2568 Commits

Author SHA1 Message Date
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
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
Jan Steemann 7f9ae2292c fix geo index comparison 2014-02-26 15:11:07 +01:00
Jan Steemann 4137eb72ae prevent segfault 2014-02-26 15:03:58 +01:00
Jan Steemann b086729d1b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-26 14:23:13 +01:00
Jan Steemann 42465ce876 properly return collection status 2014-02-26 14:23:06 +01:00
Max Neunhoeffer c1ac5eeecf Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-26 13:58:26 +01:00
Jan Steemann 276a3cf3a1 added SHORTEST_PATH AQL function, fixed bug in Graph.pathTo 2014-02-26 13:34:42 +01:00
Max Neunhoeffer 54d62007f2 Create users in new cluster database (if given). 2014-02-26 13:28:20 +01:00
Jan Steemann 8e05df9950 split tests 2014-02-26 13:21:10 +01:00
Jan Steemann e0ec5768a5 disallow dropping certain system collections 2014-02-26 12:04:28 +01:00
Jan Steemann 0b50c0353d disallow dropping certain system collections 2014-02-26 12:01:56 +01:00
Jan Steemann 9ac1a7cc50 cluster-internal authentication 2014-02-26 12:01:41 +01:00
Jan Steemann 9a56f68468 fixed return value for remove 2014-02-26 11:07:32 +01:00
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
2014-02-25 17:21:14 +01:00
Jan Steemann 98ceb07b77 add initial user 2014-02-25 17:05:02 +01:00
Frank Celler 3c5f3a656b Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 15:32:12 +01:00
Frank Celler f2121ff442 cleanup 2014-02-25 15:32:07 +01:00
Max Neunhoeffer 6d88ec3dde Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-25 14:24:41 +01:00
Max Neunhoeffer 4add2b4c9f The sin of the day: Disable transactions on coordinators. 2014-02-25 14:24:22 +01:00
Jan Steemann 00cd7cd936 fix error message for udf document keys 2014-02-25 14:23:59 +01:00
Jan Steemann 0d57a95d52 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 14:08:08 +01:00
Jan Steemann e1f3b6f2d4 react on empty shard lists 2014-02-25 14:08:00 +01:00
Frank Celler 569778ae10 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 12:07:46 +01:00