1
0
Fork 0
Commit Graph

9835 Commits

Author SHA1 Message Date
Jan Steemann 8ef247eae5 fixed compile warning 2014-01-16 15:05:08 +01:00
Jan Steemann bfbf7de9d3 fixed compile warning 2014-01-16 15:04:42 +01:00
Jan Steemann c9dabaca86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:02:44 +01:00
Max Neunhoeffer 5b4a0bf3c2 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:01:53 +01:00
Max Neunhoeffer 5960c103bc Create/drop Database/Collection compiles. 2014-01-16 15:01:36 +01:00
Jan Steemann 334cd51e6f include console 2014-01-16 15:01:07 +01:00
Jan Steemann 4a731a0c9e removed unused file 2014-01-16 14:53:35 +01:00
Jan Steemann a987647bd2 handle state changes 2014-01-16 14:52:40 +01:00
Max Neunhoeffer 8a9fe34ad6 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-01-16 12:12:29 +01:00
Max Neunhoeffer 78716f841f State before moving DB/Coll Ops to ClusterInfo. 2014-01-16 12:10:42 +01:00
Jan Steemann 405d05ecff added symbolic name 2014-01-16 12:10:31 +01:00
Jan Steemann f193cc31ef added diagnostic output for heartbeat 2014-01-16 11:39:40 +01:00
Jan Steemann 481cd2d1be added collection._dbName 2014-01-16 11:10:37 +01:00
Max Neunhoeffer 784bd4375d Use ClusterInfo::listDatabases with reload in JS_ListDatabases_Coordinator. 2014-01-16 08:54:12 +01:00
Frank Celler f56ac27dc9 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	CMakeLists.txt
	GNUmakefile
	Makefile.in
	VERSION
	arangod/V8Server/ApplicationV8.cpp
	build.h
	configure
	configure.ac
	js/actions/api-foxx.js
	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
	lib/BasicsC/locks-win32.c
2014-01-16 08:53:31 +01:00
Frank Celler c890caf260 fixed typos in windows parts 2014-01-16 08:40:36 +01:00
Frank Celler e1b622bb87 commented out tests 2014-01-15 22:58:03 +01:00
Frank Celler 01b717d0bb removed skip-list 2014-01-15 22:57:35 +01:00
Jan Steemann 065a780cf2 updated CHANGELOG
Conflicts:
	CHANGELOG
2014-01-15 18:20:32 +01:00
Jan Steemann 657406bb70 fixed jslint warnings 2014-01-15 18:15:38 +01:00
Jan Steemann e68a98e837 fixed Doxygen errors
Conflicts:
	Documentation/InstallationManual/Installing.md
	lib/BasicsC/locks-win32.c
2014-01-15 18:15:22 +01:00
Jan Steemann f760d056df added startupPath value to result of /_api/foxx/config
Conflicts:
	js/actions/api-foxx.js
2014-01-15 18:10:26 +01:00
Jan Steemann db0c6dacae added test 2014-01-15 18:09:56 +01:00
Jan Steemann d8ac4046f8 added fm.configJson method 2014-01-15 18:07:47 +01:00
Jan Steemann f60da45340 updated CHANGELOG 2014-01-15 18:07:05 +01:00
Jan Steemann 72902b2e62 fixed jslint warnings 2014-01-15 18:06:17 +01:00
Jan Steemann 69a6e6449e fixed Doxygen errors 2014-01-15 18:06:07 +01:00
Jan Steemann cfdbb1996e added startupPath value to result of /_api/foxx/config 2014-01-15 18:05:27 +01:00
Jan Steemann 231e277113 added fm.configJson method 2014-01-15 17:54:59 +01:00
Jan Steemann 52c1e7ab25 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-15 17:22:29 +01:00
Jan Steemann 3b192782c5 removed some code 2014-01-15 17:22:13 +01:00
Michael Hackstein 4a2d874678 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-15 17:14:35 +01:00
Michael Hackstein 3421822f0e First version of server view displaying pairs of db servers. Design missing 2014-01-15 17:13:59 +01:00
Michael Hackstein a4e500ebf5 Improved the overview and added a seperate coordinators view, it is actually completely different compared to db servers 2014-01-15 17:08:56 +01:00
Jan Steemann c0e185c859 don't throw in autocompleter 2014-01-15 16:27:13 +01:00
Jan Steemann 7f757801b6 force reload of databases 2014-01-15 16:21:56 +01:00
Jan Steemann b0e4dc91dd adjusted listDatabases and doesDatabaseExist 2014-01-15 16:01:05 +01:00
Jan Steemann 9335b1fd29 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-15 15:13:38 +01:00
Jan Steemann f66c4400b4 fixed arangom script 2014-01-15 15:13:26 +01:00
Michael Hackstein 6feeab89b6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-15 14:50:10 +01:00
Michael Hackstein bb1a12c76b Finished first version of Cluster Overview using fake data. User now gets a prominent overview over his cluster and can decide if coordinators or databases are effected by failures 2014-01-15 14:49:56 +01:00
Frank Celler 39ea33a68e release version 1.4.5 2014-01-15 14:35:35 +01:00
Frank Celler c0bf43d641 added ARANGODB_CONFIG_PATH 2014-01-15 14:27:01 +01:00
Jan Steemann 85c75926e3 moved script 2014-01-15 14:14:57 +01:00
Jan Steemann a0be99b6a6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-15 14:00:50 +01:00
Jan Steemann fcb545d268 removed unused methods 2014-01-15 14:00:42 +01:00
Max Neunhoeffer 97476ccf08 Create Collection completed. Use new AgencyComm. 2014-01-15 13:59:41 +01:00
Max Neunhoeffer d3c39dddb3 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-15 13:38:24 +01:00
Jan Steemann 85967c3786 fixed invalid JSON value 2014-01-15 13:38:13 +01:00
Max Neunhoeffer 016b07b61c Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-01-15 13:38:08 +01:00