1
0
Fork 0

Merge branch 'devel' of github.com:arangodb/arangodb into devel

This commit is contained in:
Michael Hackstein 2017-04-21 11:31:55 +02:00
commit 44ef7e9627
2 changed files with 12 additions and 8 deletions

View File

@ -10,8 +10,10 @@ or using Docker containers.
- [Single instance](Single.md)
- [Cluster: DC/OS, Apache Mesos and Marathon](Mesos.md)
- [Cluster: Test setup on a local machine](Local.md)
- [Cluster: Starting processes on different machines](Distributed.md)
- [Cluster: Launching an ArangoDB cluster using Docker containers](Docker.md)
- [Agency](Agency.md)
- [Cluster: Generic & Docker](ArangoDBStarter.md)
- [Advanced Topics](Advanced.md)
- [Cluster: Test setup on a local machine](Local.md)
- [Cluster: Starting processes on different machines](Distributed.md)
- [Cluster: Launching an ArangoDB cluster using Docker containers](Docker.md)
- [Agency](Agency.md)

View File

@ -123,10 +123,12 @@
* [Deployment](Deployment/README.md)
* [Single instance](Deployment/Single.md)
* [Cluster: Mesos, DC/OS](Deployment/Mesos.md)
* [Cluster: Local test](Deployment/Local.md)
* [Cluster: Processes](Deployment/Distributed.md)
* [Cluster: Docker](Deployment/Docker.md)
* [Agency](Deployment/Agency.md)
* [Cluster: Generic & Docker](Deployment/ArangoDBStarter.md)
* [Advanced Topics](Deployment/Advanced.md)
* [Standalone Agency](Deployment/Agency.md)
* [Cluster: Local test setups](Deployment/Local.md)
* [Cluster: Processes](Deployment/Distributed.md)
* [Cluster: Docker](Deployment/Docker.md)
#
* [Administration](Administration/README.md)
* [Web Interface](Administration/WebInterface/README.md)