You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ka...@apache.org on 2016/02/01 03:49:28 UTC

svn commit: r1727886 [1/16] - in /mesos/site: ./ publish/ publish/assets/img/documentation/ publish/community/ publish/documentation/ publish/documentation/allocation-module/ publish/documentation/app-framework-development-guide/ publish/documentation/...

Author: kapil
Date: Mon Feb  1 02:49:25 2016
New Revision: 1727886

URL: http://svn.apache.org/viewvc?rev=1727886&view=rev
Log:
Synced SVN site repo with GIT repo for 0.27.0.

Added:
    mesos/site/publish/documentation/executor-http-api/
    mesos/site/publish/documentation/executor-http-api/index.html
    mesos/site/publish/documentation/high-availability-framework-guide/
    mesos/site/publish/documentation/high-availability-framework-guide/index.html
    mesos/site/publish/documentation/latest/executor-http-api/
    mesos/site/publish/documentation/latest/executor-http-api/index.html
    mesos/site/publish/documentation/latest/high-availability-framework-guide/
    mesos/site/publish/documentation/latest/high-availability-framework-guide/index.html
    mesos/site/publish/documentation/latest/logging/
    mesos/site/publish/documentation/latest/logging/index.html
    mesos/site/publish/documentation/latest/mesos-containerizer/
    mesos/site/publish/documentation/latest/mesos-containerizer/index.html
    mesos/site/publish/documentation/latest/newbie-guide/
    mesos/site/publish/documentation/latest/newbie-guide/index.html
    mesos/site/publish/documentation/latest/quota/
    mesos/site/publish/documentation/latest/quota/index.html
    mesos/site/publish/documentation/latest/versioning/
    mesos/site/publish/documentation/latest/versioning/index.html
    mesos/site/publish/documentation/logging/
    mesos/site/publish/documentation/logging/index.html
    mesos/site/publish/documentation/mesos-containerizer/
    mesos/site/publish/documentation/mesos-containerizer/index.html
    mesos/site/publish/documentation/newbie-guide/
    mesos/site/publish/documentation/newbie-guide/index.html
    mesos/site/publish/documentation/quota/
    mesos/site/publish/documentation/quota/index.html
    mesos/site/publish/documentation/versioning/
    mesos/site/publish/documentation/versioning/index.html
    mesos/site/source/blog/2015-12-16-mesos-0-26-0-released.md
    mesos/site/source/documentation/latest/containerizer-internals.md
    mesos/site/source/documentation/latest/executor-http-api.md
    mesos/site/source/documentation/latest/high-availability-framework-guide.md
    mesos/site/source/documentation/latest/logging.md
    mesos/site/source/documentation/latest/mesos-containerizer.md
    mesos/site/source/documentation/latest/mesos-provisioner.md
    mesos/site/source/documentation/latest/newbie-guide.md
    mesos/site/source/documentation/latest/quota.md
    mesos/site/source/documentation/latest/sandbox.md
    mesos/site/source/documentation/latest/versioning.md
Removed:
    mesos/site/publish/assets/img/documentation/ec_kill_seqdiag.png
    mesos/site/publish/assets/img/documentation/ec_launch_seqdiag.png
    mesos/site/publish/assets/img/documentation/ec_lifecycle_seqdiag.png
    mesos/site/publish/assets/img/documentation/ec_orphan_seqdiag.png
    mesos/site/publish/assets/img/documentation/ec_recover_seqdiag.png
    mesos/site/publish/assets/img/documentation/fetch_components.jpg
    mesos/site/publish/assets/img/documentation/fetch_evict1.jpg
    mesos/site/publish/assets/img/documentation/fetch_evict2.jpg
    mesos/site/publish/assets/img/documentation/fetch_evict3.jpg
    mesos/site/publish/assets/img/documentation/fetch_flow.jpg
    mesos/site/publish/assets/img/documentation/fetch_state.jpg
    mesos/site/publish/assets/img/documentation/maintenance-primitives-modes.png
    mesos/site/publish/assets/img/documentation/networking-architecture.png
    mesos/site/publish/assets/img/documentation/oversubscription-overview.jpg
    mesos/site/publish/documentation/latest/logging-and-debugging/
    mesos/site/publish/documentation/latest/mesos-documentation-guide/
    mesos/site/publish/documentation/logging-and-debugging/
    mesos/site/publish/documentation/mesos-documentation-guide/
    mesos/site/source/documentation/latest/home.md
    mesos/site/source/documentation/latest/logging-and-debugging.md
    mesos/site/source/documentation/latest/mesos-documentation-guide.md
Modified:
    mesos/site/Rakefile
    mesos/site/publish/community/index.html
    mesos/site/publish/documentation/allocation-module/index.html
    mesos/site/publish/documentation/app-framework-development-guide/index.html
    mesos/site/publish/documentation/architecture/index.html
    mesos/site/publish/documentation/attributes-resources/index.html
    mesos/site/publish/documentation/authentication/index.html
    mesos/site/publish/documentation/authorization/index.html
    mesos/site/publish/documentation/c++-style-guide/index.html
    mesos/site/publish/documentation/clang-format/index.html
    mesos/site/publish/documentation/committers/index.html
    mesos/site/publish/documentation/configuration/index.html
    mesos/site/publish/documentation/containerizer-internals/index.html
    mesos/site/publish/documentation/containerizer/index.html
    mesos/site/publish/documentation/docker-containerizer/index.html
    mesos/site/publish/documentation/effective-code-reviewing/index.html
    mesos/site/publish/documentation/external-containerizer/index.html
    mesos/site/publish/documentation/fetcher-cache-internals/index.html
    mesos/site/publish/documentation/fetcher/index.html
    mesos/site/publish/documentation/frameworks/index.html
    mesos/site/publish/documentation/getting-started/index.html
    mesos/site/publish/documentation/high-availability/index.html
    mesos/site/publish/documentation/index.html
    mesos/site/publish/documentation/latest/allocation-module/index.html
    mesos/site/publish/documentation/latest/app-framework-development-guide/index.html
    mesos/site/publish/documentation/latest/architecture/index.html
    mesos/site/publish/documentation/latest/attributes-resources/index.html
    mesos/site/publish/documentation/latest/authentication/index.html
    mesos/site/publish/documentation/latest/authorization/index.html
    mesos/site/publish/documentation/latest/c++-style-guide/index.html
    mesos/site/publish/documentation/latest/clang-format/index.html
    mesos/site/publish/documentation/latest/committers/index.html
    mesos/site/publish/documentation/latest/configuration/index.html
    mesos/site/publish/documentation/latest/containerizer-internals/index.html
    mesos/site/publish/documentation/latest/containerizer/index.html
    mesos/site/publish/documentation/latest/docker-containerizer/index.html
    mesos/site/publish/documentation/latest/effective-code-reviewing/index.html
    mesos/site/publish/documentation/latest/external-containerizer/index.html
    mesos/site/publish/documentation/latest/fetcher-cache-internals/index.html
    mesos/site/publish/documentation/latest/fetcher/index.html
    mesos/site/publish/documentation/latest/frameworks/index.html
    mesos/site/publish/documentation/latest/getting-started/index.html
    mesos/site/publish/documentation/latest/high-availability/index.html
    mesos/site/publish/documentation/latest/index.html
    mesos/site/publish/documentation/latest/maintenance/index.html
    mesos/site/publish/documentation/latest/markdown-style-guide/index.html
    mesos/site/publish/documentation/latest/mesos-provisioner/index.html
    mesos/site/publish/documentation/latest/modules/index.html
    mesos/site/publish/documentation/latest/networking-for-mesos-managed-containers/index.html
    mesos/site/publish/documentation/latest/operational-guide/index.html
    mesos/site/publish/documentation/latest/oversubscription/index.html
    mesos/site/publish/documentation/latest/persistent-volume/index.html
    mesos/site/publish/documentation/latest/powered-by-mesos/index.html
    mesos/site/publish/documentation/latest/release-guide/index.html
    mesos/site/publish/documentation/latest/reservation/index.html
    mesos/site/publish/documentation/latest/roles/index.html
    mesos/site/publish/documentation/latest/sandbox/index.html
    mesos/site/publish/documentation/latest/scheduler-http-api/index.html
    mesos/site/publish/documentation/latest/slave-recovery/index.html
    mesos/site/publish/documentation/latest/submitting-a-patch/index.html
    mesos/site/publish/documentation/latest/tools/index.html
    mesos/site/publish/documentation/latest/upgrades/index.html
    mesos/site/publish/documentation/maintenance/index.html
    mesos/site/publish/documentation/markdown-style-guide/index.html
    mesos/site/publish/documentation/mesos-provisioner/index.html
    mesos/site/publish/documentation/modules/index.html
    mesos/site/publish/documentation/networking-for-mesos-managed-containers/index.html
    mesos/site/publish/documentation/operational-guide/index.html
    mesos/site/publish/documentation/oversubscription/index.html
    mesos/site/publish/documentation/persistent-volume/index.html
    mesos/site/publish/documentation/powered-by-mesos/index.html
    mesos/site/publish/documentation/release-guide/index.html
    mesos/site/publish/documentation/reservation/index.html
    mesos/site/publish/documentation/roles/index.html
    mesos/site/publish/documentation/sandbox/index.html
    mesos/site/publish/documentation/scheduler-http-api/index.html
    mesos/site/publish/documentation/slave-recovery/index.html
    mesos/site/publish/documentation/submitting-a-patch/index.html
    mesos/site/publish/documentation/tools/index.html
    mesos/site/publish/documentation/upgrades/index.html
    mesos/site/publish/downloads/index.html
    mesos/site/publish/gettingstarted/index.html
    mesos/site/publish/index.html
    mesos/site/publish/sitemap.xml
    mesos/site/source/assets/css/main.css
    mesos/site/source/blog/2015-10-12-mesos-0-25-0-released.md
    mesos/site/source/community.html.md
    mesos/site/source/documentation/latest.html.md
    mesos/site/source/documentation/latest/allocation-module.md
    mesos/site/source/documentation/latest/app-framework-development-guide.md
    mesos/site/source/documentation/latest/architecture.md
    mesos/site/source/documentation/latest/attributes-resources.md
    mesos/site/source/documentation/latest/authentication.md
    mesos/site/source/documentation/latest/authorization.md
    mesos/site/source/documentation/latest/c++-style-guide.md
    mesos/site/source/documentation/latest/clang-format.md
    mesos/site/source/documentation/latest/committers.md
    mesos/site/source/documentation/latest/configuration.md
    mesos/site/source/documentation/latest/containerizer.md
    mesos/site/source/documentation/latest/docker-containerizer.md
    mesos/site/source/documentation/latest/effective-code-reviewing.md
    mesos/site/source/documentation/latest/external-containerizer.md
    mesos/site/source/documentation/latest/fetcher.md
    mesos/site/source/documentation/latest/frameworks.md
    mesos/site/source/documentation/latest/getting-started.md
    mesos/site/source/documentation/latest/high-availability.md
    mesos/site/source/documentation/latest/maintenance.md
    mesos/site/source/documentation/latest/markdown-style-guide.md
    mesos/site/source/documentation/latest/modules.md
    mesos/site/source/documentation/latest/networking-for-mesos-managed-containers.md
    mesos/site/source/documentation/latest/operational-guide.md
    mesos/site/source/documentation/latest/oversubscription.md
    mesos/site/source/documentation/latest/persistent-volume.md
    mesos/site/source/documentation/latest/powered-by-mesos.md
    mesos/site/source/documentation/latest/reconciliation.md
    mesos/site/source/documentation/latest/release-guide.md
    mesos/site/source/documentation/latest/reporting-a-bug.md
    mesos/site/source/documentation/latest/reservation.md
    mesos/site/source/documentation/latest/roles.md
    mesos/site/source/documentation/latest/scheduler-http-api.md
    mesos/site/source/documentation/latest/slave-recovery.md
    mesos/site/source/documentation/latest/submitting-a-patch.md
    mesos/site/source/documentation/latest/testing-patterns.md
    mesos/site/source/documentation/latest/tools.md
    mesos/site/source/documentation/latest/upgrades.md
    mesos/site/source/downloads.html.md
    mesos/site/source/index.html.md

Modified: mesos/site/Rakefile
URL: http://svn.apache.org/viewvc/mesos/site/Rakefile?rev=1727886&r1=1727885&r2=1727886&view=diff
==============================================================================
--- mesos/site/Rakefile (original)
+++ mesos/site/Rakefile Mon Feb  1 02:49:25 2016
@@ -39,6 +39,7 @@ task :update_docs => :clone_mesos do
   docs_dir = File.join(File.dirname(__FILE__), "source/documentation")
 
   puts "Cleaning up docs directories"
+  FileUtils.rm_f(Dir.glob("source/*"))
   FileUtils.rm_f(Dir.glob("source/documentation/latest/*.md"))
   FileUtils.rm_f(Dir.glob("source/documentation/latest/images/*"))
   if !File.exists?(File.expand_path("source/documentation/latest/images/"))
@@ -46,6 +47,7 @@ task :update_docs => :clone_mesos do
   end
 
   puts "Updating docs to the latest version"
+  FileUtils.cp_r(Dir.glob("#{mesos_dir}/site/source/*"), File.expand_path("source/"))
   FileUtils.cp_r(Dir.glob("#{mesos_dir}/docs/*.md"), File.expand_path("source/documentation/latest/"))
   FileUtils.cp_r(Dir.glob("#{mesos_dir}/docs/images/*"), File.expand_path("source/documentation/latest/images/"))
   puts "Parse documentation files to removing md extension in any links"

Modified: mesos/site/publish/community/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/community/index.html?rev=1727886&r1=1727885&r2=1727886&view=diff
==============================================================================
--- mesos/site/publish/community/index.html (original)
+++ mesos/site/publish/community/index.html Mon Feb  1 02:49:25 2016
@@ -131,6 +131,10 @@
     <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
 
 </div>
+<div class="col-md-12">
+  <h3 name="calendar">Events Calendar</h3>
+  <iframe src="https://calendar.google.com/calendar/embed?src=2hecvndc0mnaqlir34cqnfvtak%40group.calendar.google.com" style="border: 0" width="100%" height="600" frameborder="0" scrolling="no"></iframe>
+</div>
 </div>
 
 

Modified: mesos/site/publish/documentation/allocation-module/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/allocation-module/index.html?rev=1727886&r1=1727885&r2=1727886&view=diff
==============================================================================
--- mesos/site/publish/documentation/allocation-module/index.html (original)
+++ mesos/site/publish/documentation/allocation-module/index.html Mon Feb  1 02:49:25 2016
@@ -146,7 +146,7 @@ mesos::modules::Module&lt;Allocator&gt;
     createExternalAllocator);
 </code></pre>
 
-<p>Refer to the <a href="http://mesos.apache.org/documentation/latest/modules/">Mesos Modules documentation</a> for instructions how to compile and load a module in Mesos master.</p>
+<p>Refer to the <a href="/documentation/latest/modules/">Mesos Modules documentation</a> for instructions on how to compile and load a module in Mesos master.</p>
 
 	</div>
 </div>

Modified: mesos/site/publish/documentation/app-framework-development-guide/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/app-framework-development-guide/index.html?rev=1727886&r1=1727885&r2=1727886&view=diff
==============================================================================
--- mesos/site/publish/documentation/app-framework-development-guide/index.html (original)
+++ mesos/site/publish/documentation/app-framework-development-guide/index.html Mon Feb  1 02:49:25 2016
@@ -149,7 +149,7 @@ virtual void resourceOffers(SchedulerDri
  * whatever reason an offer is never rescinded (e.g., dropped
  * message, failing over framework, etc.), a framework that attempts
  * to launch tasks using an invalid offer will receive TASK_LOST
- * status updats for those tasks (see Scheduler::resourceOffers).
+ * status updates for those tasks (see Scheduler::resourceOffers).
  */
 virtual void offerRescinded(SchedulerDriver* driver,
                             const OfferID&amp; offerId) = 0;
@@ -192,6 +192,8 @@ virtual void slaveLost(SchedulerDriver*
  * Invoked when an executor has exited/terminated. Note that any
  * tasks running will have TASK_LOST status updates automagically
  * generated.
+ *
+ * NOTE: This callback is not reliably delivered.
  */
 virtual void executorLost(SchedulerDriver* driver,
                           const ExecutorID&amp; executorId,
@@ -206,6 +208,10 @@ virtual void executorLost(SchedulerDrive
 virtual void error(SchedulerDriver* driver, const std::string&amp; message) = 0;
 </code></pre>
 
+<h3>Handling Failures</h3>
+
+<p>How to build Mesos frameworks that remain available in the face of failures is discussed in a <a href="/documentation/latest/high-availability-framework-guide/">separate document</a>.</p>
+
 <h2>Working with Executors</h2>
 
 <h3>Using the Mesos Command Executor</h3>

Modified: mesos/site/publish/documentation/architecture/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/architecture/index.html?rev=1727886&r1=1727885&r2=1727886&view=diff
==============================================================================
--- mesos/site/publish/documentation/architecture/index.html (original)
+++ mesos/site/publish/documentation/architecture/index.html Mon Feb  1 02:49:25 2016
@@ -83,19 +83,19 @@
 	<div class="col-md-8">
 		<h1>Mesos Architecture</h1>
 
-<p><img src="/assets/img/documentation/architecture3.jpg" alt="Mesos Architecture" /></p>
+<p><img src="images/architecture3.jpg" alt="Mesos Architecture" /></p>
 
-<p>The above figure shows the main components of Mesos.  Mesos consists of a <em>master</em> daemon that manages <em>slave</em> daemons running on each cluster node, and <em>mesos applications</em> (also called <em>frameworks</em>) that run <em>tasks</em> on these slaves.</p>
+<p>The above figure shows the main components of Mesos.  Mesos consists of a <em>master</em> daemon that manages <em>slave</em> daemons running on each cluster node, and <em>Mesos frameworks</em> that run <em>tasks</em> on these slaves.</p>
 
-<p>The master enables fine-grained sharing of resources (cpu, ram, &hellip;) across applications by making them <em>resource offers</em>. Each resource offer contains a list of &lt;slave ID, resource1: amount1, resource2, amount2, &hellip;&gt;.  The master decides <em>how many</em> resources to offer to each framework according to a given organizational policy, such as fair sharing, or strict priority. To support a diverse set of policies, the master employs a modular architecture that makes it easy to add new allocation modules via a plugin mechanism.</p>
+<p>The master enables fine-grained sharing of resources (CPU, RAM, &hellip;) across frameworks by making them <em>resource offers</em>. Each resource offer contains a list of &lt;slave ID, resource1: amount1, resource2, amount2, &hellip;&gt;.  The master decides <em>how many</em> resources to offer to each framework according to a given organizational policy, such as fair sharing or strict priority. To support a diverse set of policies, the master employs a modular architecture that makes it easy to add new allocation modules via a plugin mechanism.</p>
 
-<p>A framework running on top of Mesos consists of two components: a <em>scheduler</em> that registers with the master to be offered resources, and an <em>executor</em> process that is launched on slave nodes to run the framework&rsquo;s tasks (see the <a href="/documentation/latest/app-framework-development-guide/">App/Framework development guide</a> for more details about application schedulers and executors). While the master determines <strong>how many</strong> resources are offered to each framework, the frameworks' schedulers select <strong>which</strong> of the offered resources to use. When a frameworks accepts offered resources, it passes to Mesos a description of the tasks it wants to run on them. In turn, Mesos launches the tasks on the corresponding slaves.</p>
+<p>A framework running on top of Mesos consists of two components: a <em>scheduler</em> that registers with the master to be offered resources, and an <em>executor</em> process that is launched on slave nodes to run the framework&rsquo;s tasks (/documentation/latest/see the <a href="app-framework-development-guide/">App/Framework development guide</a> for more details about framework schedulers and executors). While the master determines <strong>how many</strong> resources are offered to each framework, the frameworks' schedulers select <strong>which</strong> of the offered resources to use. When a frameworks accepts offered resources, it passes to Mesos a description of the tasks it wants to run on them. In turn, Mesos launches the tasks on the corresponding slaves.</p>
 
 <h2>Example of resource offer</h2>
 
 <p>The figure below shows an example of how a framework gets scheduled to run a task.</p>
 
-<p><img src="/assets/img/documentation/architecture-example.jpg" alt="Mesos Architecture" /></p>
+<p><img src="images/architecture-example.jpg" alt="Mesos Architecture" /></p>
 
 <p>Let&rsquo;s walk through the events in the figure.</p>
 

Modified: mesos/site/publish/documentation/attributes-resources/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/attributes-resources/index.html?rev=1727886&r1=1727885&r2=1727886&view=diff
==============================================================================
--- mesos/site/publish/documentation/attributes-resources/index.html (original)
+++ mesos/site/publish/documentation/attributes-resources/index.html Mon Feb  1 02:49:25 2016
@@ -168,7 +168,7 @@ key : text ( "(" resourceRole ")" )?
 resourceRole : text | "*"
 </code></pre>
 
-<p>Note that <code>resourceRole</code> must be one of the <a href="/documentation/latest/roles/">roles</a> that was defined when the Mesos master was started.</p>
+<p>Note that <code>resourceRole</code> must be a valid role name; see the <a href="/documentation/latest/roles/">roles</a> documentation for details.</p>
 
 <h2>Predefined Uses &amp; Conventions</h2>
 

Modified: mesos/site/publish/documentation/authentication/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/authentication/index.html?rev=1727886&r1=1727885&r2=1727886&view=diff
==============================================================================
--- mesos/site/publish/documentation/authentication/index.html (original)
+++ mesos/site/publish/documentation/authentication/index.html Mon Feb  1 02:49:25 2016
@@ -100,7 +100,7 @@
 
 <h2>Configuration</h2>
 
-<p>The <a href="http://mesos.apache.org/documentation/latest/configuration/">configuration options</a> that are used by the authentication mechanism are as follows:</p>
+<p>The <a href="/documentation/latest/configuration/">configuration options</a> that are used by the authentication mechanism are as follows:</p>
 
 <h3>Masters</h3>
 

Modified: mesos/site/publish/documentation/authorization/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/authorization/index.html?rev=1727886&r1=1727885&r2=1727886&view=diff
==============================================================================
--- mesos/site/publish/documentation/authorization/index.html (original)
+++ mesos/site/publish/documentation/authorization/index.html Mon Feb  1 02:49:25 2016
@@ -83,27 +83,36 @@
 	<div class="col-md-8">
 		<h1>Authorization</h1>
 
-<p>Mesos 0.20.0 adds support for framework authorization. Authorization allows</p>
+<p>Authorization currently allows</p>
 
 <ol>
-<li>Frameworks to (re-)register with authorized <code>roles</code>.</li>
-<li>Frameworks to launch tasks/executors as authorized <code>users</code>.</li>
-<li>Authorized <code>principals</code> to shutdown framework(s) through &ldquo;/shutdown&rdquo; HTTP endpoint.</li>
+<li>Frameworks to (re-)register with authorized <em>roles</em>.</li>
+<li>Frameworks to launch tasks/executors as authorized <em>users</em>.</li>
+<li>Authorized <em>principals</em> to teardown frameworks through the &ldquo;/teardown&rdquo; HTTP endpoint.</li>
+<li>Authorized <em>principals</em> to set and remove quotas through the &ldquo;/quota&rdquo; HTTP endpoint.</li>
+<li>Authorized <em>principals</em> to reserve and unreserve resources through the &ldquo;/reserve&rdquo; and &ldquo;/unreserve&rdquo; HTTP endpoints, as well as with the <code>RESERVE</code> and <code>UNRESERVE</code> offer operations.</li>
+<li>Authorized <em>principals</em> to create and destroy persistent volumes through the &ldquo;/create-volumes&rdquo; and &ldquo;/destroy-volumes&rdquo; HTTP endpoints, as well as with the <code>CREATE</code> and <code>DESTROY</code> offer operations.</li>
 </ol>
 
 
 <h2>ACLs</h2>
 
-<p>Authorization is implemented via Access Control Lists (ACLs). For each of the 3 cases described above there is a corresponding ACL(s) that can be set to restrict access. Operators can setup ACLs in JSON format. See <a href="https://github.com/apache/mesos/blob/master/include/mesos/mesos.proto">mesos.proto</a> for details.</p>
+<p>Authorization is implemented via Access Control Lists (ACLs). For each of the above cases, ACLs can be used to restrict access. Operators can setup ACLs in JSON format. See <a href="https://github.com/apache/mesos/blob/master/include/mesos/authorizer/authorizer.proto">authorizer.proto</a> for details.</p>
 
 <p>Each ACL specifies a set of <code>Subjects</code> that can perform an <code>Action</code> on a set of <code>Objects</code>.</p>
 
 <p>The currently supported <code>Actions</code> are:</p>
 
 <ol>
-<li>&ldquo;register_frameworks&rdquo;: Register Frameworks</li>
+<li>&ldquo;register_frameworks&rdquo;: Register frameworks</li>
 <li>&ldquo;run_tasks&rdquo;: Run tasks/executors</li>
-<li>&ldquo;shutdown_frameworks&rdquo;: Shutdown frameworks</li>
+<li>&ldquo;teardown_frameworks&rdquo;: Teardown frameworks</li>
+<li>&ldquo;set_quotas&rdquo;: Set quotas</li>
+<li>&ldquo;remove_quotas&rdquo;: Remove quotas</li>
+<li>&ldquo;reserve_resources&rdquo;: Reserve resources</li>
+<li>&ldquo;unreserve_resources&rdquo;: Unreserve resources</li>
+<li>&ldquo;create_volumes&rdquo;: Create persistent volumes</li>
+<li>&ldquo;destroy_volumes&rdquo;: Destroy persistent volumes</li>
 </ol>
 
 
@@ -113,8 +122,8 @@
 <li>&ldquo;principals&rdquo;
 
 <ul>
-<li>Framework principals (used by &ldquo;register_frameworks&rdquo; and &ldquo;run_tasks&rdquo; actions)</li>
-<li>Usernames (used by &ldquo;shutdown_frameworks&rdquo; action)</li>
+<li>Framework principals (used by &ldquo;register_frameworks&rdquo;, &ldquo;run_tasks&rdquo;, &ldquo;reserve&rdquo;, &ldquo;unreserve&rdquo;, &ldquo;create_volumes&rdquo;, and &ldquo;destroy_volumes&rdquo; actions)</li>
+<li>Usernames (used by &ldquo;teardown_frameworks&rdquo;, &ldquo;set_quotas&rdquo;, &ldquo;remove_quotas&rdquo;, &ldquo;reserve&rdquo;, &ldquo;unreserve&rdquo;, &ldquo;create_volumes&rdquo;, and &ldquo;destroy_volumes&rdquo; actions)</li>
 </ul>
 </li>
 </ol>
@@ -123,29 +132,36 @@
 <p>The currently supported <code>Objects</code> are:</p>
 
 <ol>
-<li>&ldquo;roles&rdquo;: Resource <a href="/documentation/latest/roles/">roles</a> that framework can register with (used by &ldquo;register_frameworks&rdquo; action)</li>
-<li>&ldquo;users&rdquo;: Unix user to launch the task/executor as (used by &ldquo;run_tasks&rdquo; action)</li>
-<li>&ldquo;framework_principals&rdquo;: Framework principals that can be shutdown by HTTP POST (used by &ldquo;shutdown_frameworks&rdquo; action).</li>
+<li>&ldquo;roles&rdquo;: Resource <a href="/documentation/latest/roles/">roles</a> that framework can register with (used by &ldquo;register_frameworks&rdquo; and &ldquo;set_quotas&rdquo; actions)</li>
+<li>&ldquo;users&rdquo;: Unix user to launch the task/executor as (used by &ldquo;run_tasks&rdquo; actions)</li>
+<li>&ldquo;framework_principals&rdquo;: Framework principals that can be torn down by HTTP POST (used by &ldquo;teardown_frameworks&rdquo; actions).</li>
+<li>&ldquo;resources&rdquo;: Resources that can be reserved. Currently the only types considered by the default authorizer are <code>ANY</code> and <code>NONE</code> (used by &ldquo;reserves&rdquo; action).</li>
+<li>&ldquo;reserver_principals&rdquo;: Framework principals whose reserved resources can be unreserved (used by &ldquo;unreserves&rdquo; action).</li>
+<li>&ldquo;volume_types&rdquo;: Types of volumes that can be created by a given principal. Currently the only types considered by the default authorizer are <code>ANY</code> and <code>NONE</code> (used by &ldquo;create_volumes&rdquo; action).</li>
+<li>&ldquo;creator_principals&rdquo;: Principals whose persistent volumes can be destroyed (used by &ldquo;destroy_volumes&rdquo; action).</li>
+<li>&ldquo;quota_principals&rdquo;: Principals that set the quota to be removed (used by &ldquo;remove_quotas&rdquo; action)</li>
 </ol>
 
 
-<blockquote><p>NOTE: Both <code>Subjects</code> and <code>Objects</code> can take a list of strings or special values (<code>ANY</code> or <code>NONE</code>).</p></blockquote>
+<blockquote><p>NOTE: Both <code>Subjects</code> and <code>Objects</code> can be either an array of strings or one of the special values <code>ANY</code> or <code>NONE</code>.</p></blockquote>
 
 <h2>How does it work?</h2>
 
 <p>The Mesos master checks the ACLs to verify whether a request is authorized or not.</p>
 
-<p>For example, when a framework (re-)registers with the master, the &ldquo;register_frameworks&rdquo; ACLs are checked to see if the framework (<code>FrameworkInfo.principal</code>) is authorized to receive offers for the given resource role (<code>FrameworkInfo.role</code>). If not authorized, the framework is not allowed to (re-)register and gets an <code>Error</code> message back (which aborts the scheduler driver).</p>
+<p>For example, when a framework (re-)registers with the master, &ldquo;register_frameworks&rdquo; ACLs are checked to see if the framework (<code>FrameworkInfo.principal</code>) is authorized to receive offers for the given resource role (<code>FrameworkInfo.role</code>). If not authorized, the framework is not allowed to (re-)register and gets an <code>Error</code> message back (which aborts the scheduler driver).</p>
 
-<p>Similarly, when a framework launches a task(s), &ldquo;run_tasks&rdquo; ACLs are checked to see if the framework (<code>FrameworkInfo.principal</code>) is authorized to run the task/executor as the given <code>user</code>. If not authorized, the launch is rejected and the framework gets a TASK_LOST.</p>
+<p>Similarly, when a framework launches a task, &ldquo;run_tasks&rdquo; ACLs are checked to see if the framework (<code>FrameworkInfo.principal</code>) is authorized to run the task/executor as the given user. If not authorized, the launch is rejected and the framework gets a TASK_LOST.</p>
 
-<p>In the same vein, when a user/principal attempts to shutdown a framework through the &ldquo;/teardown&rdquo; HTTP endpoint on the master, &ldquo;shutdown_frameworks&rdquo; ACLs are checked to see if the <code>principal</code> is authorized to shutdown the given framework. If not authorized, the shutdown is rejected and the user receives an <code>Unauthorized</code> HTTP response.</p>
+<p>In the same vein, when a user/principal attempts to teardown a framework using the &ldquo;/teardown&rdquo; HTTP endpoint on the master, &ldquo;teardown_frameworks&rdquo; ACLs are checked to see if the principal is authorized to teardown the given framework. If not authorized, the teardown is rejected and the user receives a <code>Forbidden</code> HTTP response.</p>
+
+<p>If no user/principal is provided in a request to an HTTP endpoint and authentication is disabled, the <code>ANY</code> subject is used in the authorization.</p>
 
 <p>There are couple of important things to note:</p>
 
 <ol>
-<li><p>ACLs are matched in the order that they are setup. In other words, the first matching ACL determines whether a request is authorized or not.</p></li>
-<li><p>If none of the specified ACLs match the given request, whether the request is authorized or not is defined by <code>ACLs.permissive</code> field. By default this is &ldquo;true&rdquo; i.e., a non-matching request is authorized.</p></li>
+<li><p>ACLs are matched in the order that they are specified. In other words, the first matching ACL determines whether a request is authorized or not.</p></li>
+<li><p>If no ACLs match a request, whether the request is authorized or not is determined by the <code>ACLs.permissive</code> field. This is &ldquo;true&rdquo; by default &ndash; i.e., non-matching requests are authorized.</p></li>
 </ol>
 
 
@@ -154,121 +170,140 @@
 <ol>
 <li><p>Frameworks <code>foo</code> and <code>bar</code> can run tasks as user <code>alice</code>.</p>
 
-<pre><code>     {
-       "run_tasks": [
-                      {
-                        "principals": { "values": ["foo", "bar"] },
-                        "users": { "values": ["alice"] }
-                      }
-                    ]
-     }
+<pre><code> {
+   "run_tasks": [
+                  {
+                    "principals": { "values": ["foo", "bar"] },
+                    "users": { "values": ["alice"] }
+                  }
+                ]
+ }
 </code></pre></li>
 <li><p>Any framework can run tasks as user <code>guest</code>.</p>
 
-<pre><code>     {
-       "run_tasks": [
-                      {
-                        "principals": { "type": "ANY" },
-                        "users": { "values": ["guest"] }
-                      }
-                    ]
-     }
+<pre><code> {
+   "run_tasks": [
+                  {
+                    "principals": { "type": "ANY" },
+                    "users": { "values": ["guest"] }
+                  }
+                ]
+ }
 </code></pre></li>
 <li><p>No framework can run tasks as <code>root</code>.</p>
 
-<pre><code>     {
-       "run_tasks": [
-                      {
-                        "principals": { "type": "NONE" },
-                        "users": { "values": ["root"] }
-                      }
-                    ]
-     }
+<pre><code> {
+   "run_tasks": [
+                  {
+                    "principals": { "type": "NONE" },
+                    "users": { "values": ["root"] }
+                  }
+                ]
+ }
 </code></pre></li>
 <li><p>Framework <code>foo</code> can run tasks only as user <code>guest</code> and no other user.</p>
 
-<pre><code>     {
-       "run_tasks": [
-                      {
-                        "principals": { "values": [ "foo" ] },
-                        "users": { "values": ["guest"] }
-                      },
-                      {
-                        "principals": { "values": [ "foo" ] },
-                        "users": { "type": "NONE" }
-                      }
-                    ]
-     }
-</code></pre></li>
-<li><p>Framework <code>foo</code> can register with <code>analytics</code> and <code>ads</code> roles.</p>
-
-<pre><code>     {
-       "register_frameworks": [
-                                {
-                                  "principals": { "values": ["foo"] },
-                                  "roles": { "values": ["analytics", "ads"] }
-                                }
-                              ]
-     }
-</code></pre></li>
-<li><p>Only framework <code>foo</code> and no one else can register with <code>analytics</code> role.</p>
-
-<pre><code>     {
-       "register_frameworks": [
-                                {
-                                  "principals": { "values": ["foo"] },
-                                  "roles": { "values": ["analytics"] }
-                                },
-                                {
-                                  "principals": { "type": "NONE" },
-                                  "roles": { "values": ["analytics"] }
-                                }
-                              ]
-     }
-</code></pre></li>
-<li><p>Framework <code>foo</code> can only register with <code>analytics</code> role but no other roles. Also, no other framework can register with any roles.</p>
-
-<pre><code>     {
-       "permissive" : false,
-
-       "register_frameworks": [
-                                {
-                                  "principals": { "values": ["foo"] },
-                                  "roles": { "values": ["analytics"] }
-                                }
-                              ]
-     }
-</code></pre></li>
-<li><p>Only <code>ops</code> principal can shutdown any frameworks through &ldquo;/teardown&rdquo; HTTP endpoint.</p>
-
-<pre><code>     {
-       "permissive" : false,
-
-       "shutdown_frameworks": [
-                                {
-                                  "principals": { "values": ["ops"] },
-                                  "framework_principals": { "type": "ANY" }
-                                }
-                              ]
-     }
+<pre><code> {
+   "run_tasks": [
+                  {
+                    "principals": { "values": ["foo"] },
+                    "users": { "values": ["guest"] }
+                  },
+                  {
+                    "principals": { "values": ["foo"] },
+                    "users": { "type": "NONE" }
+                  }
+                ]
+ }
+</code></pre></li>
+<li><p>Framework <code>foo</code> can register with the <code>analytics</code> and <code>ads</code> roles.</p>
+
+<pre><code> {
+   "register_frameworks": [
+                            {
+                              "principals": {
+                                "values": ["foo"]
+                              },
+                              "roles": {
+                                "values": ["analytics", "ads"]
+                              }
+                            }
+                          ]
+ }
+</code></pre></li>
+<li><p>Only framework <code>foo</code> and no one else can register with the <code>analytics</code> role.</p>
+
+<pre><code> {
+   "register_frameworks": [
+                            {
+                              "principals": {
+                                "values": ["foo"]
+                              },
+                              "roles": {
+                                "values": ["analytics"]
+                              }
+                            },
+                            {
+                              "principals": {
+                                "type": "NONE"
+                              },
+                              "roles": {
+                                "values": ["analytics"]
+                              }
+                            }
+                          ]
+ }
+</code></pre></li>
+<li><p>Framework <code>foo</code> can only register with the <code>analytics</code> role but no other roles. Also, no other framework can register with any roles or run tasks.</p>
+
+<pre><code> {
+   "permissive": false,
+   "register_frameworks": [
+                            {
+                              "principals": {
+                                "values": ["foo"]
+                              },
+                              "roles": {
+                                "values": ["analytics"]
+                              }
+                            }
+                          ]
+ }
+</code></pre></li>
+<li><p>The <code>ops</code> principal can teardown any framework using the &ldquo;/teardown&rdquo; HTTP endpoint. No other framework can register with any roles or run tasks.</p>
+
+<pre><code> {
+   "permissive": false,
+   "teardown_frameworks": [
+                            {
+                              "principals": {
+                                "values": ["ops"]
+                              },
+                              "framework_principals": {
+                                "type": "ANY"
+                              }
+                            }
+                          ]
+ }
 </code></pre></li>
 </ol>
 
 
-<h2>Enabling authorization</h2>
+<h2>Configuring authorization</h2>
 
-<p>As part of this feature, a new flag was added to the master.</p>
+<p>Authorization is configured by specifying the <code>--acls</code> flag when starting the master:</p>
 
 <ul>
-<li><code>acls</code> :  The value could be a JSON-formatted string of ACLs
-          or a file path containing the JSON-formatted ACLs used
-          for authorization. Path could be of the form &lsquo;file:///path/to/file&rsquo;
-          or &lsquo;/path/to/file&rsquo;.
-          See the ACLs protobuf in mesos.proto for the expected format.</li>
+<li><code>acls</code>:  The value could be a JSON-formatted string of ACLs
+         or a file path containing the JSON-formatted ACLs used
+         for authorization. Path could be of the form &lsquo;file:///path/to/file&rsquo;
+         or &lsquo;/path/to/file&rsquo;.
+         See the ACLs protobuf in authorizer.proto for the expected format.</li>
 </ul>
 
 
-<p><strong>For the complete list of master options: ./mesos-master.sh &ndash;help</strong></p>
+<p>For more information on master command-line flags, see the
+<a href="/documentation/latest/configuration/">configuration</a> page.</p>
 
 	</div>
 </div>

Modified: mesos/site/publish/documentation/c++-style-guide/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/c%2B%2B-style-guide/index.html?rev=1727886&r1=1727885&r2=1727886&view=diff
==============================================================================
--- mesos/site/publish/documentation/c++-style-guide/index.html (original)
+++ mesos/site/publish/documentation/c++-style-guide/index.html Mon Feb  1 02:49:25 2016
@@ -83,7 +83,7 @@
 	<div class="col-md-8">
 		<h1>Mesos C++ Style Guide</h1>
 
-<p>The Mesos codebase follows the <a href="http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml">Google C++ Style Guide</a> with some notable differences, as described below. Note that the <a href="/documentation/latest/clang-format/">clang-format</a> tool can be helpful to ensure that some of the mechanical style rules are obeyed.</p>
+<p>The Mesos codebase follows the <a href="/documentation/latest/http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml">Google C++ Style Guide</a> with some notable differences, as described below. Note that the <a href="clang-format/">clang-format</a> tool can be helpful to ensure that some of the mechanical style rules are obeyed.</p>
 
 <h2>Scoping</h2>
 
@@ -151,9 +151,22 @@ void Slave::statusUpdate(StatusUpdate up
 <ul>
 <li>End each sentence within a comment with a punctuation mark (please note that we generally prefer periods); this applies to incomplete sentences as well.</li>
 <li>For trailing comments, leave one space.</li>
+<li>Use backticks when quoting code excerpts or object/variable/function names. For example:</li>
 </ul>
 
 
+<pre><code class="{.cpp}">// Use `SchedulerDriver::acceptOffers()` to send several offer
+// operations. This makes use of the `RESERVE()` and `UNRESERVE()`
+// helpers, which take a `Resources` object as input and produce
+// appropriate offer operations. Note that we are unreserving the
+// resources contained in `dynamicallyReserved1`.
+driver.acceptOffers({offer.id()},
+    {UNRESERVE(dynamicallyReserved1),
+     RESERVE(dynamicallyReserved2),
+     RESERVE(dynamicallyReserved3)},
+    filters);
+</code></pre>
+
 <h2>Breaks</h2>
 
 <ul>
@@ -167,7 +180,7 @@ void Slave::statusUpdate(StatusUpdate up
 
 <ul>
 <li>Access modifiers are not indented (Google uses one space indentation).</li>
-<li>Constructor initializers are indented by 2 spaces (Google indents by 4).</li>
+<li>Constructor initializers are indented by two spaces (Google indents by four).</li>
 </ul>
 
 
@@ -181,7 +194,7 @@ void Slave::statusUpdate(StatusUpdate up
 <h3>Function Definition/Invocation</h3>
 
 <ul>
-<li>Newline when calling or defining a function: indent with 4 spaces.</li>
+<li>Newline when calling or defining a function: indent with four spaces.</li>
 <li>We do not follow Google&rsquo;s style of wrapping on the open parenthesis, the general goal is to reduce visual &ldquo;jaggedness&rdquo; in the code. Prefer (1), (4), (5), sometimes (3), never (2):</li>
 </ul>
 
@@ -219,7 +232,7 @@ allocator-&gt;resourcesRecovered(
 <h3>Continuation</h3>
 
 <ul>
-<li>Newline for an assignment statement: indent with 2 spaces.</li>
+<li>Newline for an assignment statement: indent with two spaces.</li>
 </ul>
 
 
@@ -230,9 +243,24 @@ allocator-&gt;resourcesRecovered(
 <h2>Empty Lines</h2>
 
 <ul>
-<li>1 blank line at the end of the file.</li>
-<li>Elements outside classes (classes, structs, global functions, etc.) should be spaced apart by 2 blank lines.</li>
-<li>Elements inside classes (member variables and functions) should not be spaced apart by more than 1 blank line.</li>
+<li>One empty line at the end of the file.</li>
+<li>Inside a code block, every multi-line statement should be followed by one empty line.</li>
+</ul>
+
+
+<pre><code class="{.cpp}">Try&lt;very_very_long_type&gt; long_name =
+    ::protobuf::parse&lt;very_very_long_type&gt;(
+        request);
+
+for (int i = 0; i &lt; very_very_long_expression();
+     i++) {
+  // No empty line here for control constructs.
+}
+</code></pre>
+
+<ul>
+<li>Elements outside classes (classes, structs, global functions, etc.) should be spaced apart by two empty lines.</li>
+<li>Elements inside classes (member variables and functions) should not be spaced apart by more than one empty line.</li>
 </ul>
 
 
@@ -321,43 +349,75 @@ s += "world"; // THIS IS A DANGLING REFE
 <ul>
 <li><p>Mesos source files must contain the &ldquo;ASF&rdquo; header:</p>
 
-<pre><code>  /**
-   * Licensed to the Apache Software Foundation (ASF) under one
-   * or more contributor license agreements.  See the NOTICE file
-   * distributed with this work for additional information
-   * regarding copyright ownership.  The ASF licenses this file
-   * to you under the Apache License, Version 2.0 (the
-   * "License"); you may not use this file except in compliance
-   * with the License.  You may obtain a copy of the License at
-   *
-   *     http://www.apache.org/licenses/LICENSE-2.0
-   *
-   * Unless required by applicable law or agreed to in writing, software
-   * distributed under the License is distributed on an "AS IS" BASIS,
-   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   * See the License for the specific language governing permissions and
-   * limitations under the License.
-   */
+<pre><code>   // Licensed to the Apache Software Foundation (ASF) under one
+   // or more contributor license agreements.  See the NOTICE file
+   // distributed with this work for additional information
+   // regarding copyright ownership.  The ASF licenses this file
+   // to you under the Apache License, Version 2.0 (the
+   // "License"); you may not use this file except in compliance
+   // with the License.  You may obtain a copy of the License at
+   //
+   //     http://www.apache.org/licenses/LICENSE-2.0
+   //
+   // Unless required by applicable law or agreed to in writing, software
+   // distributed under the License is distributed on an "AS IS" BASIS,
+   // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   // See the License for the specific language governing permissions and
+   // limitations under the License.
 </code></pre></li>
 <li><p>Stout and libprocess source files must contain the &ldquo;Apache License Version 2.0&rdquo; header:</p>
 
-<pre><code>  /**
-   * Licensed under the Apache License, Version 2.0 (the "License");
-   * you may not use this file except in compliance with the License.
-   * You may obtain a copy of the License at
-   *
-   *     http://www.apache.org/licenses/LICENSE-2.0
-   *
-   * Unless required by applicable law or agreed to in writing, software
-   * distributed under the License is distributed on an "AS IS" BASIS,
-   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   * See the License for the specific language governing permissions and
-   * limitations under the License
-   */
+<pre><code>   // Licensed under the Apache License, Version 2.0 (the "License");
+   // you may not use this file except in compliance with the License.
+   // You may obtain a copy of the License at
+   //
+   //     http://www.apache.org/licenses/LICENSE-2.0
+   //
+   // Unless required by applicable law or agreed to in writing, software
+   // distributed under the License is distributed on an "AS IS" BASIS,
+   // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   // See the License for the specific language governing permissions and
+   // limitations under the License
 </code></pre></li>
 </ul>
 
 
+<h2>Order of includes</h2>
+
+<p>In addition to the ordering rules from the Google style guide, Mesos related headers are separated into sections. Newline to separate each section.
+Mesos related headers in <code>include</code> directories are partitioned by their subfolders, sorted alphabetically, and included using brackets.
+Header in <code>src</code> directories are included afterwards, using the same rules but with quotes instead of brackets.</p>
+
+<p>Example for <code>src/common/foo.cpp</code>:</p>
+
+<pre><code class="{.cpp}">#include "common/foo.hpp"
+
+#include &lt;stdint.h&gt;
+
+#include &lt;string&gt;
+#include &lt;vector&gt;
+
+#include &lt;boost/circular_buffer.hpp&gt;
+
+#include &lt;mesos/mesos.hpp&gt;
+#include &lt;mesos/type_utils.hpp&gt;
+
+#include &lt;mesos/module/authenticator.hpp&gt;
+
+#include &lt;mesos/scheduler/scheduler.hpp&gt;
+
+#include &lt;process/http.hpp&gt;
+#include &lt;process/protobuf.hpp&gt;
+
+#include &lt;stout/foreach.hpp&gt;
+#include &lt;stout/hashmap.hpp&gt;
+
+#include "common/build.hpp"
+#include "common/protobuf_utils.hpp"
+
+#include "master/flags.hpp"
+</code></pre>
+
 <h2>C++11</h2>
 
 <p>We support C++11 and require GCC 4.8+ or Clang 3.5+ compilers. The whitelist of supported C++11 features is:</p>

Modified: mesos/site/publish/documentation/clang-format/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/clang-format/index.html?rev=1727886&r1=1727885&r2=1727886&view=diff
==============================================================================
--- mesos/site/publish/documentation/clang-format/index.html (original)
+++ mesos/site/publish/documentation/clang-format/index.html Mon Feb  1 02:49:25 2016
@@ -85,7 +85,7 @@
 
 <p><a href="http://llvm.org/releases/3.5.1/tools/clang/docs/ClangFormat.html">ClangFormat</a> is an automatic source code formatting tool which helps us focus on the code rather than the formatting.</p>
 
-<blockquote><p>The provided configurations try to honor the <a href="http://mesos.apache.org/documentation/latest/c++-style-guide/">Mesos C++ Style Guide</a> as much as possible, but there are some limitations which require manual attention. Even with these limitations however, ClangFormat will be extremely useful for your workflow!</p></blockquote>
+<blockquote><p>The provided configurations try to honor the <a href="/documentation/latest/c++-style-guide/">Mesos C++ Style Guide</a> as much as possible, but there are some limitations which require manual attention. Even with these limitations however, ClangFormat will be extremely useful for your workflow!</p></blockquote>
 
 <h2>Setup</h2>
 

Modified: mesos/site/publish/documentation/committers/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/committers/index.html?rev=1727886&r1=1727885&r2=1727886&view=diff
==============================================================================
--- mesos/site/publish/documentation/committers/index.html (original)
+++ mesos/site/publish/documentation/committers/index.html Mon Feb  1 02:49:25 2016
@@ -87,7 +87,7 @@
 
 <h2>Becoming a committer</h2>
 
-<p>Every new committer has to be proposed by a current committer and then voted in by the members of the Mesos PMC. For details about this process and for candidate requirements see the general <a href="https://community.apache.org/newcommitter.html">Apache guidelines for assessing new candidates for committership</a>. Candidates prepare for their nomination as committer by contributing to the Mesos project and its community, by acting according to the <a href="http://theapacheway.com">Apache Way</a>, and by generally following the path <a href="https://community.apache.org/contributors/">from contributor to committer</a> for Apache projects. Specifically for the Mesos project, you can make use of the <a href="/documentation/latest/committer-candidate-checklist/">Apache Mesos Committer Candidate Checklist</a> for suggestions of what kind of contributions and demonstrated behaviors can be instrumental, and to keep track of your progress.</p>
+<p>Every new committer has to be proposed by a current committer and then voted in by the members of the Mesos PMC. For details about this process and for candidate requirements see the general <a href="/documentation/latest/https://community.apache.org/newcommitter.html">Apache guidelines for assessing new candidates for committership</a>. Candidates prepare for their nomination as committer by contributing to the Mesos project and its community, by acting according to the <a href="http://theapacheway.com">Apache Way</a>, and by generally following the path <a href="https://community.apache.org/contributors/">from contributor to committer</a> for Apache projects. Specifically for the Mesos project, you can make use of the <a href="committer-candidate-checklist/">Apache Mesos Committer Candidate Checklist</a> for suggestions of what kind of contributions and demonstrated behaviors can be instrumental, and to keep track of your progress.</p>
 
 <h2>Current Committers</h2>
 
@@ -107,7 +107,7 @@
     <tr>
       <td>-8</td>
       <td>Ross Allen</td>
-      <td></td>
+      <td>Facebook</td>
       <td></td>
       <td>ssorallen@apache.org</td>
     </tr>
@@ -122,7 +122,7 @@
       <td>-8</td>
       <td>Adam B</td>
       <td>Mesosphere</td>
-      <td></td>
+      <td>adam-mesos</td>
       <td>me@apache.org</td>
     </tr>
     <tr>
@@ -149,7 +149,7 @@
     <tr>
       <td>-8</td>
       <td>Dominic Hamon</td>
-      <td></td>
+      <td>YouTube</td>
       <td></td>
       <td>dma@apache.org</td>
     </tr>
@@ -170,14 +170,14 @@
     <tr>
       <td>-8</td>
       <td>Vinod Kone</td>
-      <td>Twitter</td>
+      <td>Mesosphere</td>
       <td>vinodkone</td>
       <td>vinodkone@apache.org</td>
     </tr>
     <tr>
       <td>-8</td>
       <td>Andy Konwinski</td>
-      <td>UC Berkeley</td>
+      <td>Databricks</td>
       <td></td>
       <td>andrew@apache.org</td>
     </tr>
@@ -191,7 +191,7 @@
     <tr>
       <td>-8</td>
       <td>Benjamin Mahler</td>
-      <td>Twitter</td>
+      <td>Mesosphere</td>
       <td>bmahler</td>
       <td>bmahler@apache.org</td>
     </tr>
@@ -226,11 +226,18 @@
     <tr>
       <td>-8</td>
       <td>Niklas Quarfot Nielsen</td>
-      <td>Mesosphere</td>
+      <td>Intel</td>
       <td>niq_</td>
       <td>nnielsen@apache.org</td>
     </tr>
     <tr>
+      <td>-5</td>
+      <td>Michael Park</td>
+      <td>Mesosphere</td>
+      <td>mpark</td>
+      <td>mpark@apache.org</td>
+    </tr>
+    <tr>
       <td>-8</td>
       <td>Charles Reiss</td>
       <td>UC Berkeley</td>
@@ -268,7 +275,7 @@
     <tr>
       <td>-8</td>
       <td>Jie Yu</td>
-      <td>Twitter</td>
+      <td>Mesosphere</td>
       <td>jieyu</td>
       <td>jieyu@apache.org</td>
     </tr>