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

1111 Commits

Author SHA1 Message Date
Jan Steemann ea2af50683 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	Documentation/ImplementorManual/HttpSystem.md
	js/apps/system/aardvark/aardvark.js
	js/apps/system/aardvark/frontend/css/buttons.css
	js/server/version-check.js
 2014-01-24 14:50:09 +01:00
Frank Celler 6679995e76 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	Documentation/man/man1/arangob.1
	Documentation/man/man1/arangodump.1
	Documentation/man/man1/arangoimp.1
	Documentation/man/man1/arangorestore.1
	Documentation/man/man1/arangosh.1
	Documentation/man/man8/arango-dfdb.8
	Documentation/man/man8/arangod.8
	Documentation/man/man8/foxx-manager.8
	Documentation/man/man8/rcarangod.8
	Makefile.in
	VERSION
	aclocal.m4
	build.h
	config/config.guess
	config/config.sub
	config/missing
	configure
	configure.ac
	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/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/server/bootstrap/module-internal.js
	js/server/modules/org/arangodb/actions.js
	js/server/modules/org/arangodb/foxx/authentication.js
	js/server/modules/org/arangodb/foxx/manager.js
	lib/ApplicationServer/ApplicationServer.cpp
 2014-01-23 22:24:20 +01:00
Jan Steemann d55a5b156c added tests and documentation for issue #748 2014-01-23 17:22:19 +01:00
Jan Steemann 6ec73a5589 fixed reference to unused variable 2014-01-23 16:48:24 +01:00
Michael Hackstein 25dee09874 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-23 16:31:41 +01:00
dajester2013 bc09265335 Update ahuacatl.js 
vertexFilterType -> vertexFilterMethod
 2014-01-23 06:02:30 -06:00
dajester2013 f99df3b6b0 Update ahuacatl.js 
followVertices changed to filterVertices
 2014-01-23 05:48:23 -06:00
dajester2013 1cad676170 Update ahuacatl.js 
fix indentation
 2014-01-23 05:46:34 -06:00
dajester2013 27806d90a8 traversal(_tree) vertex filtering 
added params "filterVertices" and "vertexFilterType" to traversal(_tree).  "filterVertices" accepts an array of examples similar to "followEdges", while "vertexFilterType" defines how to filter out vertices that do not match the examples. "vertexFilterType" can be set to "prune", "exclude", or (default) ["prune","exclude"].
 2014-01-23 05:45:28 -06:00
Jan Steemann 5f442ef742 bugfixes 2014-01-23 11:47:49 +01:00
Michael Hackstein 6a0d219bd5 Fixed bug in agency communication. Discrepancy with Agency content 2014-01-23 10:12:48 +01:00
Jan Steemann 39fd7611ed load/unload of collections 2014-01-22 17:20:06 +01:00
Jan Steemann 8a74c2864e cleanup of current/collections 2014-01-22 11:41:32 +01:00
Jan Steemann 3e84a3b650 don't throw errors on startup on coordinator 2014-01-22 08:37:54 +01:00
Jan Steemann 7e732174ce Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-21 15:14:13 +01:00
Jan Steemann ddfa36274d preparation 2014-01-21 15:14:07 +01:00
Michael Hackstein 23e0122f0f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-21 14:42:22 +01:00
Max Neunhoeffer a1a99170e1 Add information about Current collections to ClusterInfo. 2014-01-21 14:28:30 +01:00
Michael Hackstein 7cd01e816c Fixed new discrepancies between the etcd agency and the high level javascript communication, based on Shards in Collections in the Current state 2014-01-21 14:16:24 +01:00
Jan Steemann 17c8de6560 updated CHANGELOG 
Conflicts:
	CHANGELOG
 2014-01-21 13:41:20 +01:00
Jan Steemann 2d4db0ea40 mount all system apps by name 2014-01-21 13:39:57 +01:00
Jan Steemann f6b872e01c updated CHANGELOG 2014-01-21 13:38:32 +01:00
Jan Steemann 0c039e0264 mount all system apps by name 2014-01-21 13:27:40 +01:00
Jan Steemann 74c76ce41e Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-21 11:10:52 +01:00
Jan Steemann 2ddacc65e8 clean up Current/Databases for ourselves 2014-01-21 11:10:25 +01:00
Max Neunhoeffer 06953daf80 Fix reporting of dropped shard in Current. 2014-01-21 10:44:02 +01:00
Max Neunhoeffer eec3c08f87 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-21 09:57:26 +01:00
Max Neunhoeffer 18436b6b27 Fix reporting of new collection in Current (shardID instead of DBserverID) 2014-01-21 09:56:54 +01:00
Jan Steemann 64417d4423 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-01-21 09:29:45 +01:00
Michael Hackstein c7f86b3def Updated high-level js communication library for newest version of agency comm 2014-01-20 16:37:56 +01:00
Jan Steemann 583878176b issue #736: AQL function to parse collection and key from document handle 
Conflicts:

	CHANGELOG
 2014-01-17 23:13:06 +01:00
Jan Steemann 9f69aae986 issue #736: AQL function to parse collection and key from document handle 2014-01-17 22:39:04 +01:00
Jan Steemann 435b56bea2 fixed dropping of collections 2014-01-17 18:27:55 +01:00
Jan Steemann 7751576907 report errors back to the server 2014-01-17 14:19:52 +01:00
Jan Steemann 0bbbd53d4d added fm.rescan() method 
Conflicts:
	CHANGELOG
 2014-01-17 14:06:27 +01:00
Jan Steemann c7380398d9 added fm.rescan() method 2014-01-17 14:04:10 +01:00
Max Neunhoeffer e5f8331093 Report collection better in Current. 2014-01-17 14:03:16 +01:00
Jan Steemann 07c0ed3bab creation/removal of local shards 2014-01-17 12:43:34 +01:00
Jan Steemann 8010963a94 handle plan change for create/drop database 2014-01-16 17:03:10 +01:00
Jan Steemann c9dabaca86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:02:44 +01:00
Jan Steemann 334cd51e6f include console 2014-01-16 15:01:07 +01:00
Jan Steemann a987647bd2 handle state changes 2014-01-16 14:52:40 +01:00
Frank Celler d0c05f6628 fixed issue #734: foxx cookie and route problem 2014-01-16 14:16:47 +01:00
Frank Celler 87009c7e6e added missing db prefix 2014-01-16 14:08:45 +01:00
Frank Celler c2c574d828 added missing encoding 2014-01-16 14:08:28 +01:00
Jan Steemann 657406bb70 fixed jslint warnings 2014-01-15 18:15:38 +01:00
Jan Steemann 72902b2e62 fixed jslint warnings 2014-01-15 18:06:17 +01:00
Jan Steemann b0e4dc91dd adjusted listDatabases and doesDatabaseExist 2014-01-15 16:01:05 +01:00
Jan Steemann fcb545d268 removed unused methods 2014-01-15 14:00:42 +01:00
Jan Steemann e02b0b52e1 renamed methods 2014-01-15 10:52:56 +01:00