Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding

Browse Source

Conflicts:
	arangod/Cluster/ClusterComm.cpp

...

This commit is contained in:

Max Neunhoeffer 2013-12-18 08:52:10 +01:00

parent 975f6b19fa cd1ab21177

commit 32f49d3c09

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available