1
0
Fork 0
Commit Graph

11605 Commits

Author SHA1 Message Date
Frank Celler f62c3f3678 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-03-01 18:14:18 +01:00
Frank Celler cdf635d5c6 added residentSizePercent 2014-03-01 18:14:14 +01:00
Michael Hackstein 5b093918e6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-01 17:33:39 +01:00
Michael Hackstein 2a796630bd Removed unused import 2014-03-01 17:33:34 +01:00
Michael Hackstein bfa6e46b4a Updated dashboard and removed headerbar 2014-03-01 17:32:46 +01:00
Frank Celler 58ca2f9647 added windows mem function 2014-03-01 17:28:06 +01:00
Frank Celler d37a5221ab added pyhsical memory for linux 2014-03-01 17:23:20 +01:00
Frank Celler e70c9bed21 added total memory for mac 2014-03-01 17:16:10 +01:00
Frank Celler cff606d6ab Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-03-01 16:14:43 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Michael Hackstein dcb022a915 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-01 15:47:27 +01:00
Claudius Weinberger c7f6315ffe Dashboard changes 2014-03-01 15:46:41 +01:00
Michael Hackstein c79215d71f If a user now clicks on a coordinator hewill be redirected to normal Admin Interface 2014-03-01 15:46:00 +01:00
Claudius Weinberger 17ee3ef0ac some UI changes 2014-03-01 14:20:12 +01:00
Michael Hackstein 799f443b2f Heartbeats are now interpreted the new way 2014-03-01 14:07:58 +01:00
Michael Hackstein 59c597061c Fixed a check in the clusterPlan, a plan is now propoerly identified as test, symmetric or asymmetric 2014-03-01 13:41:36 +01:00
Michael Hackstein 8d8b1a12fd Fix relocation of hash information on startup of cluster interface 2014-03-01 13:18:24 +01:00
Michael Hackstein b34b2b17b9 The Plan is now thrown away after deleting it and not maintained locally in the browser 2014-03-01 13:17:49 +01:00
Michael Hackstein 16ac2c7fe9 The cluster history is also loaded now yeeeehaaaww 2014-02-28 23:33:37 +01:00
Frank Celler 05e30a6b3e release version 2.0.0-beta2 2014-02-28 23:27:58 +01:00
Frank Celler b849050e5a Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0 2014-02-28 23:21:11 +01:00
Michael Hackstein af9541edbc Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 23:20:08 +01:00
Michael Hackstein 017c15638e Fixed all routes for the geraffelige dashboard reload in cluster 2014-02-28 23:19:57 +01:00
Max Neunhoeffer ee3e2e3c32 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 23:07:29 +01:00
Max Neunhoeffer 87302e87e1 Add two more items and fix some typos. 2014-02-28 23:07:15 +01:00
Jan Steemann 0f3476bb52 updated CHANGELOG 2014-02-28 23:04:55 +01:00
Jan Steemann 0c1d2a3e53 put "sharding" feature into README.md 2014-02-28 23:01:31 +01:00
Jan Steemann b66cdd6ff9 trying to fix test 2014-02-28 22:19:55 +01:00
Jan Steemann 53810bc5f5 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 22:19:28 +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
Claudius Weinberger 515f46ebfb Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 21:16:08 +01:00
Claudius Weinberger dbb601bbab change notification color 2014-02-28 21:15:47 +01:00
Jan Steemann ff567da37f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 21:00:02 +01:00
Jan Steemann 078209edc5 changed messages 2014-02-28 20:59:46 +01:00
Frank Celler c2706fd737 release version 2.0.0-beta1 2014-02-28 20:44:44 +01:00
Frank Celler b016e33aa8 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0 2014-02-28 20:37:52 +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
Frank Celler b8dc9e6d33 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	Documentation/UserManual/Aql.md
	VERSION
	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/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:30:39 +01:00
Jan Steemann 64f3ade768 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 20:29:47 +01:00
Jan Steemann 0dd2521339 updated CHANGELOG 2014-02-28 20:29:42 +01:00
Max Neunhoeffer bc3bf667dd Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 20:27:50 +01:00
Max Neunhoeffer a264b55f32 Fight zombies. 2014-02-28 20:24:42 +01:00
Jan Steemann 87284a47f9 slightly improved AQL documentation
Conflicts:
	Documentation/UserManual/Aql.md
2014-02-28 20:20:51 +01:00
Max Neunhoeffer 7a767b25ac waitpid for a child even if we do no longer know it. 2014-02-28 20:20:43 +01:00
Jan Steemann 33846f460d slightly improved AQL documentation 2014-02-28 20:17:45 +01:00
Max Neunhoeffer a1dc22e11b Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 20:02:46 +01:00
Max Neunhoeffer 5c449c67ba Add version numbers to manual chapter. 2014-02-28 20:01:50 +01:00
Jan Steemann c08c7c4dfd Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 20:00:57 +01:00
Jan Steemann b090276273 fixed tests 2014-02-28 20:00:51 +01:00