mesos git commit: Updated docs to reflect contender and detector modules.

[ka...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 149f4c55b -> 485dcaf8c


Updated docs to reflect contender and detector modules.

Add 'Master contender and detector' section to 'Mesos Modules' doc.

Review: https://reviews.apache.org/r/47292/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/485dcaf8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/485dcaf8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/485dcaf8

Branch: refs/heads/master
Commit: 485dcaf8ceddc1284ad0ae98abedc20f4588495b
Parents: 149f4c5
Author: Jay Guo <gu...@cn.ibm.com>
Authored: Wed Jul 6 12:32:25 2016 -0400
Committer: Kapil Arya <ka...@mesosphere.io>
Committed: Wed Jul 6 12:32:25 2016 -0400

----------------------------------------------------------------------
 docs/modules.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/485dcaf8/docs/modules.md
----------------------------------------------------------------------
diff --git a/docs/modules.md b/docs/modules.md
index 9319738..6019156 100644
--- a/docs/modules.md
+++ b/docs/modules.md
@@ -222,6 +222,31 @@ Isolator modules enable experimenting with specialized isolation and monitoring
 capabilities. Examples of these could be 3rdparty resource isolation mechanisms
 for GPGPU hardware, networking, etc.
 
+### Master Contender and Detector
+
+Contender and Detector modules enable developers to implement custom leader
+election and master detection mechanisms, other than relying on Zookeeper by
+default.
+
+An example for such modules could be to use distributed Key-Value storage such
+as [etcd](https://coreos.com/etcd/) and [consul](https://www.consul.io/).
+
+To load custom contender and detector module, you need to:
+
+- Supply `--modules` when running Mesos master,
+
+- Specify selected contender and detector modules with `--master_contender` and
+`--master_detector` flags on Mesos Master and `--master_detector` on Mesos Slave.
+
+For example, the following command runs Mesos master with
+`org_apache_mesos_TestMasterContender` and `org_apache_mesos_TestMasterDetector`:
+
+`./bin/mesos-master.sh --modules="file://<path-to-modules-config>.json" --master_contender=org_apache_mesos_TestMasterContender --master_detector=org_apache_mesos_TestMasterDetector`
+
+And this one runs Mesos slave with `org_apache_mesos_TestMasterDetector`:
+
+`./bin/mesos-slave.sh --modules="file://<path-to-modules-config>.json" --master_detector=org_apache_mesos_TestMasterDetector`
+
 ## Writing Mesos modules
 
 ### A HelloWorld module