Max Neunhoeffer
e5f8331093
Report collection better in Current.
2014-01-17 14:03:16 +01:00
Max Neunhoeffer
e8f7dbbf5b
Consider Plan for current state of collections.
2014-01-17 13:43:02 +01:00
Max Neunhoeffer
b9565f0e35
Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
2014-01-17 13:35:00 +01:00
Michael Hackstein
6a002416d2
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-01-17 13:07:27 +01:00
Michael Hackstein
e5c9fbec3e
Added a cascading unrender if clicking in Menu levels
2014-01-17 13:07:19 +01:00
Jan Steemann
4f31e99097
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-01-17 12:43:44 +01:00
Jan Steemann
07c0ed3bab
creation/removal of local shards
2014-01-17 12:43:34 +01:00
Michael Hackstein
099fac2582
Fixed test for clusterCoordinator
2014-01-17 11:24:29 +01:00
Max Neunhoeffer
6b4bbe5d04
Fix a description of two methods.
2014-01-17 10:59:23 +01:00
Jan Steemann
7c23c9527a
removed nrShards attribute from Json
2014-01-17 10:53:29 +01:00
Michael Hackstein
3c09a7827a
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-01-17 10:36:13 +01:00
Michael Hackstein
052e84fc2e
First version of Coordinator Overview in cluster
2014-01-17 10:36:03 +01:00
Jan Steemann
01cd66cc23
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-01-17 10:21:18 +01:00
Jan Steemann
42b5686ee2
code cleanup
2014-01-17 10:21:05 +01:00
Michael Hackstein
80ffa5d73d
First version of shard overview in cluster interface
2014-01-17 09:40:20 +01:00
Michael Hackstein
723545a1d4
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-01-17 09:24:53 +01:00
Michael Hackstein
1a233fb1d5
Added first version of Cluster collection overview
2014-01-17 09:24:46 +01:00
Max Neunhoeffer
92e52c33f8
Add a note about a possible bug.
2014-01-17 09:06:35 +01:00
Jan Steemann
9cbc6d55ca
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-01-16 17:03:23 +01:00
Jan Steemann
8010963a94
handle plan change for create/drop database
2014-01-16 17:03:10 +01:00
Max Neunhoeffer
58c5f4636c
Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
2014-01-16 16:19:14 +01:00
Max Neunhoeffer
8fe85a021b
Try to return a collections object after creation.
...
This is still buggy: ClusterInfo does not yet know about the new
setup with many entries of the form
Current/Collections/<DB-Name>/<Coll-ID>/<shard-ID>
2014-01-16 16:18:13 +01:00
Michael Hackstein
7b37f6840d
Added first version of cluster database overview. Right now only datbase name is presented to the user
2014-01-16 15:58:39 +01:00
Michael Hackstein
d0265724a3
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-01-16 15:23:35 +01:00
Michael Hackstein
f95c3dfa79
First version of primary server view in the cluster
2014-01-16 15:23:28 +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