You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gi...@apache.org on 2018/03/09 19:33:07 UTC
[2/2] mesos-site git commit: Updated the website built from mesos
SHA: a4e9695.
Updated the website built from mesos SHA: a4e9695.
Project: http://git-wip-us.apache.org/repos/asf/mesos-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos-site/commit/e99c310c
Tree: http://git-wip-us.apache.org/repos/asf/mesos-site/tree/e99c310c
Diff: http://git-wip-us.apache.org/repos/asf/mesos-site/diff/e99c310c
Branch: refs/heads/asf-site
Commit: e99c310c48593bcc54561d3471b0767a9337df10
Parents: d31af2e
Author: jenkins <bu...@apache.org>
Authored: Fri Mar 9 19:33:01 2018 +0000
Committer: jenkins <bu...@apache.org>
Committed: Fri Mar 9 19:33:01 2018 +0000
----------------------------------------------------------------------
.../include_2mesos_2executor_8hpp_source.html | 2 +-
.../api/latest/c++/scheduler_8hpp_source.html | 2 +-
content/api/latest/c++/slave_8hpp_source.html | 2 +-
.../c++/src_2master_2constants_8hpp_source.html | 4 +-
.../c++/src_2master_2master_8hpp_source.html | 22 +-
.../c++/src_2slave_2constants_8hpp_source.html | 4 +-
content/api/latest/java/index-all.html | 6 +-
.../latest/java/org/apache/mesos/Executor.html | 6 +-
.../Protos.MasterInfo.Capability.Type.html | 8 +-
.../java/org/apache/mesos/Protos.TaskState.html | 4 +-
.../latest/java/org/apache/mesos/Scheduler.html | 6 +-
content/blog/feed.xml | 16 +-
content/blog/mesos-0-19-0-released/index.html | 4 +-
content/blog/mesos-1-4-0-released/index.html | 2 +-
.../index.html | 8 +-
.../slave-recovery-in-apache-mesos/index.html | 2 +-
content/documentation/agent-recovery/index.html | 4 +-
.../app-framework-development-guide/index.html | 4 +-
.../index.html | 2 +-
.../documentation/high-availability/index.html | 2 +-
.../latest/agent-recovery/index.html | 4 +-
.../app-framework-development-guide/index.html | 4 +-
.../latest/configuration/agent/index.html | 4 +-
.../latest/configuration/master/index.html | 8 +-
.../index.html | 2 +-
.../latest/high-availability/index.html | 2 +-
.../documentation/latest/maintenance/index.html | 2 +-
.../documentation/latest/monitoring/index.html | 2 +-
.../latest/operator-http-api/index.html | 8 +-
.../latest/reconciliation/index.html | 2 +-
content/documentation/latest/roles/index.html | 2 +-
.../latest/task-state-reasons/index.html | 2 +-
content/documentation/maintenance/index.html | 2 +-
content/documentation/monitoring/index.html | 2 +-
.../documentation/operator-http-api/index.html | 8 +-
content/documentation/reconciliation/index.html | 2 +-
content/documentation/roles/index.html | 2 +-
.../documentation/task-state-reasons/index.html | 2 +-
content/sitemap.xml | 9090 +++++++++---------
39 files changed, 4630 insertions(+), 4630 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/api/latest/c++/include_2mesos_2executor_8hpp_source.html
----------------------------------------------------------------------
diff --git a/content/api/latest/c++/include_2mesos_2executor_8hpp_source.html b/content/api/latest/c++/include_2mesos_2executor_8hpp_source.html
index 1815f99..516f943 100644
--- a/content/api/latest/c++/include_2mesos_2executor_8hpp_source.html
+++ b/content/api/latest/c++/include_2mesos_2executor_8hpp_source.html
@@ -141,7 +141,7 @@
<div class="line"><a name="l00087"></a><span class="lineno"> 87</span>  <span class="keyword">const</span> FrameworkInfo& frameworkInfo,</div>
<div class="line"><a name="l00088"></a><span class="lineno"> 88</span>  <span class="keyword">const</span> SlaveInfo& slaveInfo) = 0;</div>
<div class="line"><a name="l00089"></a><span class="lineno"> 89</span> </div>
-<div class="line"><a name="l00090"></a><span class="lineno"> 90</span>  <span class="comment">// Invoked when the executor re-registers with a restarted slave.</span></div>
+<div class="line"><a name="l00090"></a><span class="lineno"> 90</span>  <span class="comment">// Invoked when the executor reregisters with a restarted slave.</span></div>
<div class="line"><a name="l00091"></a><span class="lineno"> 91</span>  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classmesos_1_1Executor.html#af7225b7c91516337ed8289230c49837b">reregistered</a>(</div>
<div class="line"><a name="l00092"></a><span class="lineno"> 92</span>  <a class="code" href="classmesos_1_1ExecutorDriver.html">ExecutorDriver</a>* driver,</div>
<div class="line"><a name="l00093"></a><span class="lineno"> 93</span>  <span class="keyword">const</span> SlaveInfo& slaveInfo) = 0;</div>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/api/latest/c++/scheduler_8hpp_source.html
----------------------------------------------------------------------
diff --git a/content/api/latest/c++/scheduler_8hpp_source.html b/content/api/latest/c++/scheduler_8hpp_source.html
index 3b301ba..bb952eb 100644
--- a/content/api/latest/c++/scheduler_8hpp_source.html
+++ b/content/api/latest/c++/scheduler_8hpp_source.html
@@ -135,7 +135,7 @@
<div class="line"><a name="l00081"></a><span class="lineno"> 81</span>  <span class="keyword">const</span> FrameworkID& frameworkId,</div>
<div class="line"><a name="l00082"></a><span class="lineno"> 82</span>  <span class="keyword">const</span> MasterInfo& masterInfo) = 0;</div>
<div class="line"><a name="l00083"></a><span class="lineno"> 83</span> </div>
-<div class="line"><a name="l00084"></a><span class="lineno"> 84</span>  <span class="comment">// Invoked when the scheduler re-registers with a newly elected</span></div>
+<div class="line"><a name="l00084"></a><span class="lineno"> 84</span>  <span class="comment">// Invoked when the scheduler reregisters with a newly elected</span></div>
<div class="line"><a name="l00085"></a><span class="lineno"> 85</span>  <span class="comment">// Mesos master. This is only called when the scheduler has</span></div>
<div class="line"><a name="l00086"></a><span class="lineno"> 86</span>  <span class="comment">// previously been registered. MasterInfo containing the updated</span></div>
<div class="line"><a name="l00087"></a><span class="lineno"> 87</span>  <span class="comment">// information about the elected master is provided as an argument.</span></div>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/api/latest/c++/slave_8hpp_source.html
----------------------------------------------------------------------
diff --git a/content/api/latest/c++/slave_8hpp_source.html b/content/api/latest/c++/slave_8hpp_source.html
index 65ccfe8..b2639f4 100644
--- a/content/api/latest/c++/slave_8hpp_source.html
+++ b/content/api/latest/c++/slave_8hpp_source.html
@@ -331,7 +331,7 @@
<div class="line"><a name="l00277"></a><span class="lineno"> 277</span>  <span class="keyword">const</span> FrameworkID& frameworkId,</div>
<div class="line"><a name="l00278"></a><span class="lineno"> 278</span>  <span class="keyword">const</span> ExecutorID& executorId);</div>
<div class="line"><a name="l00279"></a><span class="lineno"> 279</span> </div>
-<div class="line"><a name="l00280"></a><span class="lineno"> 280</span>  <span class="comment">// Called when an executor re-registers with a recovering slave.</span></div>
+<div class="line"><a name="l00280"></a><span class="lineno"> 280</span>  <span class="comment">// Called when an executor reregisters with a recovering slave.</span></div>
<div class="line"><a name="l00281"></a><span class="lineno"> 281</span>  <span class="comment">// 'tasks' : Unacknowledged tasks (i.e., tasks that the executor</span></div>
<div class="line"><a name="l00282"></a><span class="lineno"> 282</span>  <span class="comment">// driver never received an ACK for.)</span></div>
<div class="line"><a name="l00283"></a><span class="lineno"> 283</span>  <span class="comment">// 'updates' : Unacknowledged updates.</span></div>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/api/latest/c++/src_2master_2constants_8hpp_source.html
----------------------------------------------------------------------
diff --git a/content/api/latest/c++/src_2master_2constants_8hpp_source.html b/content/api/latest/c++/src_2master_2constants_8hpp_source.html
index cd51f97..4288be5 100644
--- a/content/api/latest/c++/src_2master_2constants_8hpp_source.html
+++ b/content/api/latest/c++/src_2master_2constants_8hpp_source.html
@@ -117,9 +117,9 @@
<div class="line"><a name="l00063"></a><span class="lineno"><a class="line" href="namespacemesos_1_1internal_1_1master.html#af90683414a296615d19d715b53fb3bb2"> 63</a></span> constexpr <span class="keywordtype">size_t</span> <a class="code" href="namespacemesos_1_1internal_1_1master.html#af90683414a296615d19d715b53fb3bb2">DEFAULT_MAX_AGENT_PING_TIMEOUTS</a> = 5;</div>
<div class="line"><a name="l00064"></a><span class="lineno"> 64</span> </div>
<div class="line"><a name="l00065"></a><span class="lineno"> 65</span> <span class="comment">// The minimum timeout that can be used by a newly elected leader to</span></div>
-<div class="line"><a name="l00066"></a><span class="lineno"> 66</span> <span class="comment">// allow re-registration of slaves. Any slaves that do not re-register</span></div>
+<div class="line"><a name="l00066"></a><span class="lineno"> 66</span> <span class="comment">// allow re-registration of slaves. Any slaves that do not reregister</span></div>
<div class="line"><a name="l00067"></a><span class="lineno"> 67</span> <span class="comment">// within this timeout will be marked unreachable; if/when the agent</span></div>
-<div class="line"><a name="l00068"></a><span class="lineno"> 68</span> <span class="comment">// re-registers, non-partition-aware tasks running on the agent will</span></div>
+<div class="line"><a name="l00068"></a><span class="lineno"> 68</span> <span class="comment">// reregisters, non-partition-aware tasks running on the agent will</span></div>
<div class="line"><a name="l00069"></a><span class="lineno"> 69</span> <span class="comment">// be terminated.</span></div>
<div class="line"><a name="l00070"></a><span class="lineno"><a class="line" href="namespacemesos_1_1internal_1_1master.html#a20e5905952444eba6901a5b9de5a29c8"> 70</a></span> constexpr <a class="code" href="classDuration.html">Duration</a> <a class="code" href="namespacemesos_1_1internal_1_1master.html#a20e5905952444eba6901a5b9de5a29c8">MIN_AGENT_REREGISTER_TIMEOUT</a> = <a class="code" href="classMinutes.html">Minutes</a>(10);</div>
<div class="line"><a name="l00071"></a><span class="lineno"> 71</span> </div>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/api/latest/c++/src_2master_2master_8hpp_source.html
----------------------------------------------------------------------
diff --git a/content/api/latest/c++/src_2master_2master_8hpp_source.html b/content/api/latest/c++/src_2master_2master_8hpp_source.html
index 9a9eb50..17a5542 100644
--- a/content/api/latest/c++/src_2master_2master_8hpp_source.html
+++ b/content/api/latest/c++/src_2master_2master_8hpp_source.html
@@ -263,10 +263,10 @@
<div class="line"><a name="l00209"></a><span class="lineno"><a class="line" href="structmesos_1_1internal_1_1master_1_1Slave.html#aa112c6ba4de9bd7ab91365adf92d5c77"> 209</a></span>  <span class="keywordtype">bool</span> <a class="code" href="structmesos_1_1internal_1_1master_1_1Slave.html#aa112c6ba4de9bd7ab91365adf92d5c77">active</a>;</div>
<div class="line"><a name="l00210"></a><span class="lineno"> 210</span> </div>
<div class="line"><a name="l00211"></a><span class="lineno"> 211</span>  <span class="comment">// Timer for marking slaves unreachable that become disconnected and</span></div>
-<div class="line"><a name="l00212"></a><span class="lineno"> 212</span>  <span class="comment">// don't re-register. This timeout is larger than the slave</span></div>
+<div class="line"><a name="l00212"></a><span class="lineno"> 212</span>  <span class="comment">// don't reregister. This timeout is larger than the slave</span></div>
<div class="line"><a name="l00213"></a><span class="lineno"> 213</span>  <span class="comment">// observer's timeout, so typically the slave observer will be the</span></div>
<div class="line"><a name="l00214"></a><span class="lineno"> 214</span>  <span class="comment">// one to mark such slaves unreachable; this timer is a backup for</span></div>
-<div class="line"><a name="l00215"></a><span class="lineno"> 215</span>  <span class="comment">// when a slave responds to pings but does not re-register (e.g.,</span></div>
+<div class="line"><a name="l00215"></a><span class="lineno"> 215</span>  <span class="comment">// when a slave responds to pings but does not reregister (e.g.,</span></div>
<div class="line"><a name="l00216"></a><span class="lineno"> 216</span>  <span class="comment">// because agent recovery has hung).</span></div>
<div class="line"><a name="l00217"></a><span class="lineno"><a class="line" href="structmesos_1_1internal_1_1master_1_1Slave.html#a15e591c436773cdfb2ee3369f0541659"> 217</a></span>  <a class="code" href="classOption.html">Option<process::Timer></a> <a class="code" href="structmesos_1_1internal_1_1master_1_1Slave.html#a15e591c436773cdfb2ee3369f0541659">reregistrationTimer</a>;</div>
<div class="line"><a name="l00218"></a><span class="lineno"> 218</span> </div>
@@ -294,7 +294,7 @@
<div class="line"><a name="l00240"></a><span class="lineno"><a class="line" href="structmesos_1_1internal_1_1master_1_1Slave.html#af31bd54cf2fd44fd1d95d1c898d6d2c8"> 240</a></span>  <a class="code" href="classhashmap.html">hashmap<FrameworkID, hashmap<TaskID, Task*></a>> <a class="code" href="structmesos_1_1internal_1_1master_1_1Slave.html#af31bd54cf2fd44fd1d95d1c898d6d2c8">tasks</a>;</div>
<div class="line"><a name="l00241"></a><span class="lineno"> 241</span> </div>
<div class="line"><a name="l00242"></a><span class="lineno"> 242</span>  <span class="comment">// Tasks that were asked to kill by frameworks.</span></div>
-<div class="line"><a name="l00243"></a><span class="lineno"> 243</span>  <span class="comment">// This is used for reconciliation when the slave re-registers.</span></div>
+<div class="line"><a name="l00243"></a><span class="lineno"> 243</span>  <span class="comment">// This is used for reconciliation when the slave reregisters.</span></div>
<div class="line"><a name="l00244"></a><span class="lineno"><a class="line" href="structmesos_1_1internal_1_1master_1_1Slave.html#a471feb09e6e40006c48fa1941ae4961a"> 244</a></span>  <a class="code" href="classmultihashmap.html">multihashmap<FrameworkID, TaskID></a> <a class="code" href="structmesos_1_1internal_1_1master_1_1Slave.html#a471feb09e6e40006c48fa1941ae4961a">killedTasks</a>;</div>
<div class="line"><a name="l00245"></a><span class="lineno"> 245</span> </div>
<div class="line"><a name="l00246"></a><span class="lineno"> 246</span>  <span class="comment">// Pending operations or terminal operations that have</span></div>
@@ -706,7 +706,7 @@
<div class="line"><a name="l00652"></a><span class="lineno"> 652</span>  <span class="keyword">const</span> std::vector<TaskStatus>& statuses);</div>
<div class="line"><a name="l00653"></a><span class="lineno"> 653</span> </div>
<div class="line"><a name="l00654"></a><span class="lineno"> 654</span>  <span class="comment">// When a slave that was previously registered with this master</span></div>
-<div class="line"><a name="l00655"></a><span class="lineno"> 655</span>  <span class="comment">// re-registers, we need to reconcile the master's view of the</span></div>
+<div class="line"><a name="l00655"></a><span class="lineno"> 655</span>  <span class="comment">// reregisters, we need to reconcile the master's view of the</span></div>
<div class="line"><a name="l00656"></a><span class="lineno"> 656</span>  <span class="comment">// slave's tasks and executors. This function also sends the</span></div>
<div class="line"><a name="l00657"></a><span class="lineno"> 657</span>  <span class="comment">// `SlaveReregisteredMessage`.</span></div>
<div class="line"><a name="l00658"></a><span class="lineno"> 658</span>  <span class="keywordtype">void</span> <a class="code" href="classmesos_1_1internal_1_1master_1_1Master.html#a58719ea924d9d7508db7ed7b2bf7517f">reconcileKnownSlave</a>(</div>
@@ -721,7 +721,7 @@
<div class="line"><a name="l00667"></a><span class="lineno"> 667</span> </div>
<div class="line"><a name="l00668"></a><span class="lineno"> 668</span>  <span class="comment">// Recover a framework from its `FrameworkInfo`. This happens after</span></div>
<div class="line"><a name="l00669"></a><span class="lineno"> 669</span>  <span class="comment">// master failover, when an agent running one of the framework's</span></div>
-<div class="line"><a name="l00670"></a><span class="lineno"> 670</span>  <span class="comment">// tasks re-registers or when the framework itself re-registers,</span></div>
+<div class="line"><a name="l00670"></a><span class="lineno"> 670</span>  <span class="comment">// tasks reregisters or when the framework itself reregisters,</span></div>
<div class="line"><a name="l00671"></a><span class="lineno"> 671</span>  <span class="comment">// whichever happens first. The result of this function is a</span></div>
<div class="line"><a name="l00672"></a><span class="lineno"> 672</span>  <span class="comment">// registered, inactive framework with state `RECOVERED`.</span></div>
<div class="line"><a name="l00673"></a><span class="lineno"> 673</span>  <span class="keywordtype">void</span> <a class="code" href="classmesos_1_1internal_1_1master_1_1Master.html#a98cf6f42201feca492b223305df1a137">recoverFramework</a>(</div>
@@ -730,7 +730,7 @@
<div class="line"><a name="l00676"></a><span class="lineno"> 676</span> </div>
<div class="line"><a name="l00677"></a><span class="lineno"> 677</span>  <span class="comment">// Transition a framework from `RECOVERED` to `CONNECTED` state and</span></div>
<div class="line"><a name="l00678"></a><span class="lineno"> 678</span>  <span class="comment">// activate it. This happens at most once after master failover, the</span></div>
-<div class="line"><a name="l00679"></a><span class="lineno"> 679</span>  <span class="comment">// first time that the framework re-registers with the new master.</span></div>
+<div class="line"><a name="l00679"></a><span class="lineno"> 679</span>  <span class="comment">// first time that the framework reregisters with the new master.</span></div>
<div class="line"><a name="l00680"></a><span class="lineno"> 680</span>  <span class="comment">// Exactly one of `newPid` or `http` must be provided.</span></div>
<div class="line"><a name="l00681"></a><span class="lineno"> 681</span>  <a class="code" href="classTry.html">Try<Nothing></a> <a class="code" href="classmesos_1_1internal_1_1master_1_1Master.html#a2d4b5ce9e8d5ccd2c6aa826e9a9592a0">activateRecoveredFramework</a>(</div>
<div class="line"><a name="l00682"></a><span class="lineno"> 682</span>  <a class="code" href="structmesos_1_1internal_1_1master_1_1Framework.html">Framework</a>* framework,</div>
@@ -1744,13 +1744,13 @@
<div class="line"><a name="l01798"></a><span class="lineno"> 1798</span>  Slaves() : <a class="code" href="namespacerouting_1_1link.html#aec1d046cc8ec45a0265d0522d673ade8">removed</a>(<a class="code" href="namespacemesos_1_1internal_1_1master.html#af1f65c9e7a94cc3a9f0f48a4d5a1119a">MAX_REMOVED_SLAVES</a>) {}</div>
<div class="line"><a name="l01799"></a><span class="lineno"> 1799</span> </div>
<div class="line"><a name="l01800"></a><span class="lineno"> 1800</span>  <span class="comment">// Imposes a time limit for slaves that we recover from the</span></div>
-<div class="line"><a name="l01801"></a><span class="lineno"> 1801</span>  <span class="comment">// registry to re-register with the master.</span></div>
+<div class="line"><a name="l01801"></a><span class="lineno"> 1801</span>  <span class="comment">// registry to reregister with the master.</span></div>
<div class="line"><a name="l01802"></a><span class="lineno"> 1802</span>  <a class="code" href="classOption.html">Option<process::Timer></a> recoveredTimer;</div>
<div class="line"><a name="l01803"></a><span class="lineno"> 1803</span> </div>
<div class="line"><a name="l01804"></a><span class="lineno"> 1804</span>  <span class="comment">// Slaves that have been recovered from the registrar after master</span></div>
<div class="line"><a name="l01805"></a><span class="lineno"> 1805</span>  <span class="comment">// failover. Slaves are removed from this collection when they</span></div>
-<div class="line"><a name="l01806"></a><span class="lineno"> 1806</span>  <span class="comment">// either re-register with the master or are marked unreachable</span></div>
-<div class="line"><a name="l01807"></a><span class="lineno"> 1807</span>  <span class="comment">// because they do not re-register before `recoveredTimer` fires.</span></div>
+<div class="line"><a name="l01806"></a><span class="lineno"> 1806</span>  <span class="comment">// either reregister with the master or are marked unreachable</span></div>
+<div class="line"><a name="l01807"></a><span class="lineno"> 1807</span>  <span class="comment">// because they do not reregister before `recoveredTimer` fires.</span></div>
<div class="line"><a name="l01808"></a><span class="lineno"> 1808</span>  <span class="comment">// We must not answer questions related to these slaves (e.g.,</span></div>
<div class="line"><a name="l01809"></a><span class="lineno"> 1809</span>  <span class="comment">// during task reconciliation) until we determine their fate</span></div>
<div class="line"><a name="l01810"></a><span class="lineno"> 1810</span>  <span class="comment">// because their are in this transitioning state.</span></div>
@@ -2116,8 +2116,8 @@
<div class="line"><a name="l02170"></a><span class="lineno"><a class="line" href="structmesos_1_1internal_1_1master_1_1Framework.html#a96a90d8ae734d729489ba877367e6b65"> 2170</a></span>  <span class="keyword">enum</span> <a class="code" href="structmesos_1_1internal_1_1master_1_1Framework.html#a96a90d8ae734d729489ba877367e6b65">State</a></div>
<div class="line"><a name="l02171"></a><span class="lineno"> 2171</span>  {</div>
<div class="line"><a name="l02172"></a><span class="lineno"> 2172</span>  <span class="comment">// Framework has never connected to this master. This implies the</span></div>
-<div class="line"><a name="l02173"></a><span class="lineno"> 2173</span>  <span class="comment">// master failed over and the framework has not yet re-registered,</span></div>
-<div class="line"><a name="l02174"></a><span class="lineno"> 2174</span>  <span class="comment">// but some framework state has been recovered from re-registering</span></div>
+<div class="line"><a name="l02173"></a><span class="lineno"> 2173</span>  <span class="comment">// master failed over and the framework has not yet reregistered,</span></div>
+<div class="line"><a name="l02174"></a><span class="lineno"> 2174</span>  <span class="comment">// but some framework state has been recovered from reregistering</span></div>
<div class="line"><a name="l02175"></a><span class="lineno"> 2175</span>  <span class="comment">// agents that are running tasks for the framework.</span></div>
<div class="line"><a name="l02176"></a><span class="lineno"><a class="line" href="structmesos_1_1internal_1_1master_1_1Framework.html#a96a90d8ae734d729489ba877367e6b65a2781c7e12fec2c505d95224df19bbea4"> 2176</a></span>  <a class="code" href="structmesos_1_1internal_1_1master_1_1Framework.html#a96a90d8ae734d729489ba877367e6b65a2781c7e12fec2c505d95224df19bbea4">RECOVERED</a>,</div>
<div class="line"><a name="l02177"></a><span class="lineno"> 2177</span> </div>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/api/latest/c++/src_2slave_2constants_8hpp_source.html
----------------------------------------------------------------------
diff --git a/content/api/latest/c++/src_2slave_2constants_8hpp_source.html b/content/api/latest/c++/src_2slave_2constants_8hpp_source.html
index e90bb16..7bcdd4e 100644
--- a/content/api/latest/c++/src_2slave_2constants_8hpp_source.html
+++ b/content/api/latest/c++/src_2slave_2constants_8hpp_source.html
@@ -89,11 +89,11 @@
<div class="line"><a name="l00035"></a><span class="lineno"><a class="line" href="namespacemesos_1_1internal_1_1slave.html#a7d43125bd0cba56c9c1a0f5c43d6a1cf"> 35</a></span> constexpr <a class="code" href="classDuration.html">Duration</a> <a class="code" href="namespacemesos_1_1internal_1_1slave.html#a7d43125bd0cba56c9c1a0f5c43d6a1cf">EXECUTOR_REGISTRATION_TIMEOUT</a> = <a class="code" href="classMinutes.html">Minutes</a>(1);</div>
<div class="line"><a name="l00036"></a><span class="lineno"><a class="line" href="namespacemesos_1_1internal_1_1slave.html#a124db27a66a15baa22c129a7599ec430"> 36</a></span> constexpr <a class="code" href="classDuration.html">Duration</a> <a class="code" href="namespacemesos_1_1internal_1_1slave.html#a124db27a66a15baa22c129a7599ec430">EXECUTOR_REREGISTRATION_TIMEOUT</a> = <a class="code" href="classSeconds.html">Seconds</a>(2);</div>
<div class="line"><a name="l00037"></a><span class="lineno"> 37</span> </div>
-<div class="line"><a name="l00038"></a><span class="lineno"> 38</span> <span class="comment">// The maximum timeout within which an executor can re-register.</span></div>
+<div class="line"><a name="l00038"></a><span class="lineno"> 38</span> <span class="comment">// The maximum timeout within which an executor can reregister.</span></div>
<div class="line"><a name="l00039"></a><span class="lineno"> 39</span> <span class="comment">// Note that this value has to be << 'MIN_AGENT_REREGISTER_TIMEOUT'</span></div>
<div class="line"><a name="l00040"></a><span class="lineno"> 40</span> <span class="comment">// declared in 'master/constants.hpp'; since agent recovery will only</span></div>
<div class="line"><a name="l00041"></a><span class="lineno"> 41</span> <span class="comment">// complete after this timeout has elapsed, this ensures that the</span></div>
-<div class="line"><a name="l00042"></a><span class="lineno"> 42</span> <span class="comment">// agent can re-register with the master before it is marked</span></div>
+<div class="line"><a name="l00042"></a><span class="lineno"> 42</span> <span class="comment">// agent can reregister with the master before it is marked</span></div>
<div class="line"><a name="l00043"></a><span class="lineno"> 43</span> <span class="comment">// unreachable and its tasks are transitioned to TASK_UNREACHABLE or</span></div>
<div class="line"><a name="l00044"></a><span class="lineno"> 44</span> <span class="comment">// TASK_LOST.</span></div>
<div class="line"><a name="l00045"></a><span class="lineno"><a class="line" href="namespacemesos_1_1internal_1_1slave.html#a325e350497e1448cbf615d8881482880"> 45</a></span> constexpr <a class="code" href="classDuration.html">Duration</a> <a class="code" href="namespacemesos_1_1internal_1_1slave.html#a325e350497e1448cbf615d8881482880">MAX_EXECUTOR_REREGISTRATION_TIMEOUT</a> = <a class="code" href="classSeconds.html">Seconds</a>(15);</div>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/api/latest/java/index-all.html
----------------------------------------------------------------------
diff --git a/content/api/latest/java/index-all.html b/content/api/latest/java/index-all.html
index fba2e5d..f3209c3 100644
--- a/content/api/latest/java/index-all.html
+++ b/content/api/latest/java/index-all.html
@@ -2573,7 +2573,7 @@
<dd>
<div class="block">
The master can handle slaves whose state
- changes after re-registering.</div>
+ changes after reregistering.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/apache/mesos/Protos.RateLimits.html#AGGREGATE_DEFAULT_CAPACITY_FIELD_NUMBER">AGGREGATE_DEFAULT_CAPACITY_FIELD_NUMBER</a></span> - Static variable in class org.apache.mesos.<a href="org/apache/mesos/Protos.RateLimits.html" title="class in org.apache.mesos">Protos.RateLimits</a></dt>
<dd> </dd>
@@ -49524,11 +49524,11 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/mesos/Executor.html#reregistered-org.apache.mesos.ExecutorDriver-org.apache.mesos.Protos.SlaveInfo-">reregistered(ExecutorDriver, Protos.SlaveInfo)</a></span> - Method in interface org.apache.mesos.<a href="org/apache/mesos/Executor.html" title="interface in org.apache.mesos">Executor</a></dt>
<dd>
-<div class="block">Invoked when the executor re-registers with a restarted slave.</div>
+<div class="block">Invoked when the executor reregisters with a restarted slave.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/apache/mesos/Scheduler.html#reregistered-org.apache.mesos.SchedulerDriver-org.apache.mesos.Protos.MasterInfo-">reregistered(SchedulerDriver, Protos.MasterInfo)</a></span> - Method in interface org.apache.mesos.<a href="org/apache/mesos/Scheduler.html" title="interface in org.apache.mesos">Scheduler</a></dt>
<dd>
-<div class="block">Invoked when the scheduler re-registers with a newly elected Mesos master.</div>
+<div class="block">Invoked when the scheduler reregisters with a newly elected Mesos master.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/apache/mesos/Protos.Resource.html#RESERVATION_FIELD_NUMBER">RESERVATION_FIELD_NUMBER</a></span> - Static variable in class org.apache.mesos.<a href="org/apache/mesos/Protos.Resource.html" title="class in org.apache.mesos">Protos.Resource</a></dt>
<dd> </dd>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/api/latest/java/org/apache/mesos/Executor.html
----------------------------------------------------------------------
diff --git a/content/api/latest/java/org/apache/mesos/Executor.html b/content/api/latest/java/org/apache/mesos/Executor.html
index 63d4f1b..762e412 100644
--- a/content/api/latest/java/org/apache/mesos/Executor.html
+++ b/content/api/latest/java/org/apache/mesos/Executor.html
@@ -182,7 +182,7 @@ var activeTableTab = "activeTableTab";
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/mesos/Executor.html#reregistered-org.apache.mesos.ExecutorDriver-org.apache.mesos.Protos.SlaveInfo-">reregistered</a></span>(<a href="../../../org/apache/mesos/ExecutorDriver.html" title="interface in org.apache.mesos">ExecutorDriver</a> driver,
<a href="../../../org/apache/mesos/Protos.SlaveInfo.html" title="class in org.apache.mesos">Protos.SlaveInfo</a> slaveInfo)</code>
-<div class="block">Invoked when the executor re-registers with a restarted slave.</div>
+<div class="block">Invoked when the executor reregisters with a restarted slave.</div>
</td>
</tr>
<tr id="i7" class="rowColor">
@@ -244,10 +244,10 @@ var activeTableTab = "activeTableTab";
<h4>reregistered</h4>
<pre>void reregistered(<a href="../../../org/apache/mesos/ExecutorDriver.html" title="interface in org.apache.mesos">ExecutorDriver</a> driver,
<a href="../../../org/apache/mesos/Protos.SlaveInfo.html" title="class in org.apache.mesos">Protos.SlaveInfo</a> slaveInfo)</pre>
-<div class="block">Invoked when the executor re-registers with a restarted slave.</div>
+<div class="block">Invoked when the executor reregisters with a restarted slave.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>driver</code> - The executor driver that was re-registered with the
+<dd><code>driver</code> - The executor driver that was reregistered with the
Mesos master.</dd>
<dd><code>slaveInfo</code> - Describes the slave that will be used to launch
the tasks for this executor.</dd>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/api/latest/java/org/apache/mesos/Protos.MasterInfo.Capability.Type.html
----------------------------------------------------------------------
diff --git a/content/api/latest/java/org/apache/mesos/Protos.MasterInfo.Capability.Type.html b/content/api/latest/java/org/apache/mesos/Protos.MasterInfo.Capability.Type.html
index 8bae9e2..91c1d25 100644
--- a/content/api/latest/java/org/apache/mesos/Protos.MasterInfo.Capability.Type.html
+++ b/content/api/latest/java/org/apache/mesos/Protos.MasterInfo.Capability.Type.html
@@ -143,7 +143,7 @@ extends java.lang.Enum<<a href="../../../org/apache/mesos/Protos.MasterInfo.C
<td class="colOne"><code><span class="memberNameLink"><a href="../../../org/apache/mesos/Protos.MasterInfo.Capability.Type.html#AGENT_UPDATE">AGENT_UPDATE</a></span></code>
<div class="block">
The master can handle slaves whose state
- changes after re-registering.</div>
+ changes after reregistering.</div>
</td>
</tr>
<tr class="rowColor">
@@ -171,7 +171,7 @@ extends java.lang.Enum<<a href="../../../org/apache/mesos/Protos.MasterInfo.C
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/mesos/Protos.MasterInfo.Capability.Type.html#AGENT_UPDATE_VALUE">AGENT_UPDATE_VALUE</a></span></code>
<div class="block">
The master can handle slaves whose state
- changes after re-registering.</div>
+ changes after reregistering.</div>
</td>
</tr>
<tr class="rowColor">
@@ -292,7 +292,7 @@ the order they are declared.</div>
<pre>public static final <a href="../../../org/apache/mesos/Protos.MasterInfo.Capability.Type.html" title="enum in org.apache.mesos">Protos.MasterInfo.Capability.Type</a> AGENT_UPDATE</pre>
<div class="block"><pre>
The master can handle slaves whose state
- changes after re-registering.
+ changes after reregistering.
</pre>
<code>AGENT_UPDATE = 1;</code></div>
@@ -329,7 +329,7 @@ the order they are declared.</div>
<pre>public static final int AGENT_UPDATE_VALUE</pre>
<div class="block"><pre>
The master can handle slaves whose state
- changes after re-registering.
+ changes after reregistering.
</pre>
<code>AGENT_UPDATE = 1;</code></div>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/api/latest/java/org/apache/mesos/Protos.TaskState.html
----------------------------------------------------------------------
diff --git a/content/api/latest/java/org/apache/mesos/Protos.TaskState.html b/content/api/latest/java/org/apache/mesos/Protos.TaskState.html
index e6a5798..f340a6a 100644
--- a/content/api/latest/java/org/apache/mesos/Protos.TaskState.html
+++ b/content/api/latest/java/org/apache/mesos/Protos.TaskState.html
@@ -567,7 +567,7 @@ the order they are declared.</div>
opt-in to the PARTITION_AWARE capability.
NOTE: This state is not always terminal. For example, tasks might
transition from TASK_LOST to TASK_RUNNING or other states when a
- partitioned agent re-registers.
+ partitioned agent reregisters.
</pre>
<code>TASK_LOST = 5;</code></div>
@@ -823,7 +823,7 @@ the order they are declared.</div>
opt-in to the PARTITION_AWARE capability.
NOTE: This state is not always terminal. For example, tasks might
transition from TASK_LOST to TASK_RUNNING or other states when a
- partitioned agent re-registers.
+ partitioned agent reregisters.
</pre>
<code>TASK_LOST = 5;</code></div>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/api/latest/java/org/apache/mesos/Scheduler.html
----------------------------------------------------------------------
diff --git a/content/api/latest/java/org/apache/mesos/Scheduler.html b/content/api/latest/java/org/apache/mesos/Scheduler.html
index 6ff812f..ef522ac 100644
--- a/content/api/latest/java/org/apache/mesos/Scheduler.html
+++ b/content/api/latest/java/org/apache/mesos/Scheduler.html
@@ -181,7 +181,7 @@ var activeTableTab = "activeTableTab";
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/mesos/Scheduler.html#reregistered-org.apache.mesos.SchedulerDriver-org.apache.mesos.Protos.MasterInfo-">reregistered</a></span>(<a href="../../../org/apache/mesos/SchedulerDriver.html" title="interface in org.apache.mesos">SchedulerDriver</a> driver,
<a href="../../../org/apache/mesos/Protos.MasterInfo.html" title="class in org.apache.mesos">Protos.MasterInfo</a> masterInfo)</code>
-<div class="block">Invoked when the scheduler re-registers with a newly elected Mesos master.</div>
+<div class="block">Invoked when the scheduler reregisters with a newly elected Mesos master.</div>
</td>
</tr>
<tr id="i7" class="rowColor">
@@ -256,13 +256,13 @@ var activeTableTab = "activeTableTab";
<h4>reregistered</h4>
<pre>void reregistered(<a href="../../../org/apache/mesos/SchedulerDriver.html" title="interface in org.apache.mesos">SchedulerDriver</a> driver,
<a href="../../../org/apache/mesos/Protos.MasterInfo.html" title="class in org.apache.mesos">Protos.MasterInfo</a> masterInfo)</pre>
-<div class="block">Invoked when the scheduler re-registers with a newly elected Mesos master.
+<div class="block">Invoked when the scheduler reregisters with a newly elected Mesos master.
This is only called when the scheduler has previously been registered.
MasterInfo containing the updated information about the elected master
is provided as an argument.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>driver</code> - The driver that was re-registered.</dd>
+<dd><code>driver</code> - The driver that was reregistered.</dd>
<dd><code>masterInfo</code> - The updated information about the elected master.</dd>
<dt><span class="seeLabel">See Also:</span></dt>
<dd><a href="../../../org/apache/mesos/SchedulerDriver.html" title="interface in org.apache.mesos"><code>SchedulerDriver</code></a>,
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/blog/feed.xml
----------------------------------------------------------------------
diff --git a/content/blog/feed.xml b/content/blog/feed.xml
index 5ee2ff5..b564706 100644
--- a/content/blog/feed.xml
+++ b/content/blog/feed.xml
@@ -218,7 +218,7 @@ To learn more about CSI work in Mesos, you can dig into the design document <
<h2>Master Failover Time-To-Completion</h2>
-<p>Our first area of focus was to improve the time it takes for a master failover to complete, where completion is defined as all of the agents successfully re-registering. Mesos is architected to use a centralized master with standby masters that participate in a quorum for high availability. For scalability reasons, the leading master stores the state of the cluster in-memory. During a master failover, the leading master needs to therefore re-build the in-memory state from all of the agents that re-register. During this time, the master is available to process other requests, but will be exposing only partial state to API consumers.</p>
+<p>Our first area of focus was to improve the time it takes for a master failover to complete, where completion is defined as all of the agents successfully reregistering. Mesos is architected to use a centralized master with standby masters that participate in a quorum for high availability. For scalability reasons, the leading master stores the state of the cluster in-memory. During a master failover, the leading master needs to therefore re-build the in-memory state from all of the agents that reregister. During this time, the master is available to process other requests, but will be exposing only partial state to API consumers.</p>
<p>The rebuilding of the master’s in-memory state can be expensive for larger clusters, and so the focus of this effort was to improve the efficiency of this. Improvements were made via several areas, and only the highest-impact changes are listed below:</p>
@@ -247,10 +247,10 @@ To learn more about CSI work in Mesos, you can dig into the design document <
<h3>Benchmark and Results</h3>
-<p>We wrote a synthetic benchmark to simulate a master failover. This benchmark prepares all the messages that would be sent to the master by the agents that need to re-register:</p>
+<p>We wrote a synthetic benchmark to simulate a master failover. This benchmark prepares all the messages that would be sent to the master by the agents that need to reregister:</p>
<ul>
-<li>The benchmark uses synthetic agents in that they are just an actor that knows how to re-register with the master.</li>
+<li>The benchmark uses synthetic agents in that they are just an actor that knows how to reregister with the master.</li>
<li>Each &ldquo;agent&rdquo; will send a configurable number of active and completed tasks belonging to a configurable number of active and completed frameworks.</li>
<li>Each task has 10 small labels to introduce metadata overhead.</li>
</ul>
@@ -295,7 +295,7 @@ To learn more about CSI work in Mesos, you can dig into the design document <
</ul>
-<p>If you are a user and would like to suggest some areas for performance improvement, please let us know by emailing <a href="&#109;&#x61;&#105;&#108;&#116;&#x6f;&#58;&#x64;&#101;&#x76;&#x40;&#x61;&#112;&#x61;&#x63;&#104;&#101;&#x2e;&#x6d;&#101;&#x73;&#111;&#115;&#46;&#111;&#x72;&#103;">&#100;&#x65;&#x76;&#64;&#x61;&#112;&#97;&#x63;&#104;&#101;&#x2e;&#x6d;&#101;&#x73;&#111;&#x73;&#x2e;&#x6f;&#x72;&#x67;</a>.</p>
+<p>If you are a user and would like to suggest some areas for performance improvement, please let us know by emailing <a href="&#109;&#97;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#100;&#x65;&#x76;&#x40;&#97;&#x70;&#x61;&#x63;&#104;&#101;&#46;&#109;&#101;&#115;&#111;&#x73;&#46;&#111;&#114;&#x67;">&#x64;&#x65;&#x76;&#64;&#x61;&#x70;&#97;&#99;&#x68;&#x65;&#x2e;&#x6d;&#x65;&#x73;&#x6f;&#x73;&#46;&#111;&#114;&#x67;</a>.</p>
</content>
</entry>
@@ -427,7 +427,7 @@ to efficiently measure disk usage without enforcing usage constraints. The
previous implementation always enforced the quota even if the operator might
not have wanted it.</p></li>
<li><p><a href="https://issues.apache.org/jira/browse/MESOS-6223">MESOS-6223</a> -
-With partition awareness, the agents are now allowed to re-register after they
+With partition awareness, the agents are now allowed to reregister after they
have been marked Unreachable. Thus, they can recover their agent ID after a
host reboot. See docs/upgrades.md for details.</p></li>
<li><p><a href="https://issues.apache.org/jira/browse/MESOS-6375">MESOS-6375</a> -
@@ -3018,11 +3018,11 @@ please note the <a href="http://mesos.apache.org/documentation/latest/mo
<ul>
<li>In the event of a dual failure (slave fails while master is down), no lost task notifications are sent. This leads to a task running according to the framework but unknown to Mesos.</li>
-<li>When a new master is elected, we may allow rogue slaves to re-register with the master. This leads to tasks running on the slave that are not known to the framework.</li>
+<li>When a new master is elected, we may allow rogue slaves to reregister with the master. This leads to tasks running on the slave that are not known to the framework.</li>
</ul>
-<p>Persisting the list of registered slaves allows failed over masters to detect slaves that do not re-register, and notify frameworks accordingly. It also allows us to prevent rogue slaves from re-registering; terminating the rogue tasks in the process.</p>
+<p>Persisting the list of registered slaves allows failed over masters to detect slaves that do not reregister, and notify frameworks accordingly. It also allows us to prevent rogue slaves from reregistering; terminating the rogue tasks in the process.</p>
<p>The state is persisted using the <a href="http://mesos.apache.org/blog/mesos-0-17-0-released-featuring-autorecovery/">replicated log</a> (available since 0.9.0).</p>
@@ -3450,7 +3450,7 @@ please note the <a href="http://mesos.apache.org/documentation/latest/mo
<p> As part of this feature, the executor driver has also been improved to make it more resilient in the face of a slave failure. As an example, status updates sent by the executor while the slave is down are cached by the driver and sent to the slave when it reconnects with the restarted slave. Since this is all handled by the executor driver, framework/executor writers do not have to worry about it! The executors can keep sending status updates for their tasks while remaining oblivious to the slave being up or down.</p></li>
<li><p><strong>Reliable status updates</strong></p>
-<p> Another benefit of slave checkpointing the status updates is that now updates are more reliably delivered to frameworks in the face of failures. Before slave recovery if the slave fails at the same time that a master is failing over, no TASK_LOST updates for tasks running on the slave were sent to the framework. This is partly because the Mesos master is stateless. A failed over master reconstructs the cluster state from the information given to it by re-registering slaves and frameworks. With slave recovery, status updates and tasks are no longer lost when slaves fail. Rather, the slave recovers tasks, status updates and reconnects with the running executors. Even if an executor does terminate when the slave is down, a recovered slave knows about it from its checkpointed state and reliably sends TASK_LOST updates to the framework.</p></li>
+<p> Another benefit of slave checkpointing the status updates is that now updates are more reliably delivered to frameworks in the face of failures. Before slave recovery if the slave fails at the same time that a master is failing over, no TASK_LOST updates for tasks running on the slave were sent to the framework. This is partly because the Mesos master is stateless. A failed over master reconstructs the cluster state from the information given to it by reregistering slaves and frameworks. With slave recovery, status updates and tasks are no longer lost when slaves fail. Rather, the slave recovers tasks, status updates and reconnects with the running executors. Even if an executor does terminate when the slave is down, a recovered slave knows about it from its checkpointed state and reliably sends TASK_LOST updates to the framework.</p></li>
</ul>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/blog/mesos-0-19-0-released/index.html
----------------------------------------------------------------------
diff --git a/content/blog/mesos-0-19-0-released/index.html b/content/blog/mesos-0-19-0-released/index.html
index 84a6e33..0856b5a 100644
--- a/content/blog/mesos-0-19-0-released/index.html
+++ b/content/blog/mesos-0-19-0-released/index.html
@@ -164,11 +164,11 @@
<ul>
<li>In the event of a dual failure (slave fails while master is down), no lost task notifications are sent. This leads to a task running according to the framework but unknown to Mesos.</li>
-<li>When a new master is elected, we may allow rogue slaves to re-register with the master. This leads to tasks running on the slave that are not known to the framework.</li>
+<li>When a new master is elected, we may allow rogue slaves to reregister with the master. This leads to tasks running on the slave that are not known to the framework.</li>
</ul>
-<p>Persisting the list of registered slaves allows failed over masters to detect slaves that do not re-register, and notify frameworks accordingly. It also allows us to prevent rogue slaves from re-registering; terminating the rogue tasks in the process.</p>
+<p>Persisting the list of registered slaves allows failed over masters to detect slaves that do not reregister, and notify frameworks accordingly. It also allows us to prevent rogue slaves from reregistering; terminating the rogue tasks in the process.</p>
<p>The state is persisted using the <a href="http://mesos.apache.org/blog/mesos-0-17-0-released-featuring-autorecovery/">replicated log</a> (available since 0.9.0).</p>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/blog/mesos-1-4-0-released/index.html
----------------------------------------------------------------------
diff --git a/content/blog/mesos-1-4-0-released/index.html b/content/blog/mesos-1-4-0-released/index.html
index 8cffa8c..18c619e 100644
--- a/content/blog/mesos-1-4-0-released/index.html
+++ b/content/blog/mesos-1-4-0-released/index.html
@@ -154,7 +154,7 @@ to efficiently measure disk usage without enforcing usage constraints. The
previous implementation always enforced the quota even if the operator might
not have wanted it.</p></li>
<li><p><a href="https://issues.apache.org/jira/browse/MESOS-6223">MESOS-6223</a> -
-With partition awareness, the agents are now allowed to re-register after they
+With partition awareness, the agents are now allowed to reregister after they
have been marked Unreachable. Thus, they can recover their agent ID after a
host reboot. See docs/upgrades.md for details.</p></li>
<li><p><a href="https://issues.apache.org/jira/browse/MESOS-6375">MESOS-6375</a> -
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/blog/performance-working-group-progress-report/index.html
----------------------------------------------------------------------
diff --git a/content/blog/performance-working-group-progress-report/index.html b/content/blog/performance-working-group-progress-report/index.html
index f0025b8..c7e413b 100644
--- a/content/blog/performance-working-group-progress-report/index.html
+++ b/content/blog/performance-working-group-progress-report/index.html
@@ -171,7 +171,7 @@
<h2>Master Failover Time-To-Completion</h2>
-<p>Our first area of focus was to improve the time it takes for a master failover to complete, where completion is defined as all of the agents successfully re-registering. Mesos is architected to use a centralized master with standby masters that participate in a quorum for high availability. For scalability reasons, the leading master stores the state of the cluster in-memory. During a master failover, the leading master needs to therefore re-build the in-memory state from all of the agents that re-register. During this time, the master is available to process other requests, but will be exposing only partial state to API consumers.</p>
+<p>Our first area of focus was to improve the time it takes for a master failover to complete, where completion is defined as all of the agents successfully reregistering. Mesos is architected to use a centralized master with standby masters that participate in a quorum for high availability. For scalability reasons, the leading master stores the state of the cluster in-memory. During a master failover, the leading master needs to therefore re-build the in-memory state from all of the agents that reregister. During this time, the master is available to process other requests, but will be exposing only partial state to API consumers.</p>
<p>The rebuilding of the master’s in-memory state can be expensive for larger clusters, and so the focus of this effort was to improve the efficiency of this. Improvements were made via several areas, and only the highest-impact changes are listed below:</p>
@@ -200,10 +200,10 @@
<h3>Benchmark and Results</h3>
-<p>We wrote a synthetic benchmark to simulate a master failover. This benchmark prepares all the messages that would be sent to the master by the agents that need to re-register:</p>
+<p>We wrote a synthetic benchmark to simulate a master failover. This benchmark prepares all the messages that would be sent to the master by the agents that need to reregister:</p>
<ul>
-<li>The benchmark uses synthetic agents in that they are just an actor that knows how to re-register with the master.</li>
+<li>The benchmark uses synthetic agents in that they are just an actor that knows how to reregister with the master.</li>
<li>Each “agent” will send a configurable number of active and completed tasks belonging to a configurable number of active and completed frameworks.</li>
<li>Each task has 10 small labels to introduce metadata overhead.</li>
</ul>
@@ -248,7 +248,7 @@
</ul>
-<p>If you are a user and would like to suggest some areas for performance improvement, please let us know by emailing <a href="mailto:dev@apache.mesos.org">dev@apache.mesos.org</a>.</p>
+<p>If you are a user and would like to suggest some areas for performance improvement, please let us know by emailing <a href="mailto:dev@apache.mesos.org">dev@apache.mesos.org</a>.</p>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/blog/slave-recovery-in-apache-mesos/index.html
----------------------------------------------------------------------
diff --git a/content/blog/slave-recovery-in-apache-mesos/index.html b/content/blog/slave-recovery-in-apache-mesos/index.html
index 403bb42..8ad2dc4 100644
--- a/content/blog/slave-recovery-in-apache-mesos/index.html
+++ b/content/blog/slave-recovery-in-apache-mesos/index.html
@@ -186,7 +186,7 @@
<p> As part of this feature, the executor driver has also been improved to make it more resilient in the face of a slave failure. As an example, status updates sent by the executor while the slave is down are cached by the driver and sent to the slave when it reconnects with the restarted slave. Since this is all handled by the executor driver, framework/executor writers do not have to worry about it! The executors can keep sending status updates for their tasks while remaining oblivious to the slave being up or down.</p></li>
<li><p><strong>Reliable status updates</strong></p>
-<p> Another benefit of slave checkpointing the status updates is that now updates are more reliably delivered to frameworks in the face of failures. Before slave recovery if the slave fails at the same time that a master is failing over, no TASK_LOST updates for tasks running on the slave were sent to the framework. This is partly because the Mesos master is stateless. A failed over master reconstructs the cluster state from the information given to it by re-registering slaves and frameworks. With slave recovery, status updates and tasks are no longer lost when slaves fail. Rather, the slave recovers tasks, status updates and reconnects with the running executors. Even if an executor does terminate when the slave is down, a recovered slave knows about it from its checkpointed state and reliably sends TASK_LOST updates to the framework.</p></li>
+<p> Another benefit of slave checkpointing the status updates is that now updates are more reliably delivered to frameworks in the face of failures. Before slave recovery if the slave fails at the same time that a master is failing over, no TASK_LOST updates for tasks running on the slave were sent to the framework. This is partly because the Mesos master is stateless. A failed over master reconstructs the cluster state from the information given to it by reregistering slaves and frameworks. With slave recovery, status updates and tasks are no longer lost when slaves fail. Rather, the slave recovers tasks, status updates and reconnects with the running executors. Even if an executor does terminate when the slave is down, a recovered slave knows about it from its checkpointed state and reliably sends TASK_LOST updates to the framework.</p></li>
</ul>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/agent-recovery/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/agent-recovery/index.html b/content/documentation/agent-recovery/index.html
index 902753a..f223118 100644
--- a/content/documentation/agent-recovery/index.html
+++ b/content/documentation/agent-recovery/index.html
@@ -206,10 +206,10 @@ not recovered.</li>
</ul>
-<p>A restarted agent should re-register with master within a timeout (75 seconds
+<p>A restarted agent should reregister with master within a timeout (75 seconds
by default: see the <code>--max_agent_ping_timeouts</code> and <code>--agent_ping_timeout</code>
<a href="/documentation/latest/./configuration/">configuration flags</a>). If the agent takes longer than this
-timeout to re-register, the master shuts down the agent, which in turn will
+timeout to reregister, the master shuts down the agent, which in turn will
shutdown any live executors/tasks.</p>
<p>Therefore, it is highly recommended to automate the process of restarting an
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/app-framework-development-guide/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/app-framework-development-guide/index.html b/content/documentation/app-framework-development-guide/index.html
index 28dc308..efb2de2 100644
--- a/content/documentation/app-framework-development-guide/index.html
+++ b/content/documentation/app-framework-development-guide/index.html
@@ -152,7 +152,7 @@ virtual void registered(
const MasterInfo& masterInfo);
/*
- * Invoked when the scheduler re-registers with a newly elected Mesos master.
+ * Invoked when the scheduler reregisters with a newly elected Mesos master.
* This is only called when the scheduler has previously been registered.
* `MasterInfo` containing the updated information about the elected master
* is provided as an argument.
@@ -489,7 +489,7 @@ virtual void registered(
const SlaveInfo& slaveInfo);
/*
- * Invoked when the executor re-registers with a restarted slave.
+ * Invoked when the executor reregisters with a restarted slave.
*/
virtual void reregistered(ExecutorDriver* driver, const SlaveInfo& slaveInfo);
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/high-availability-framework-guide/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/high-availability-framework-guide/index.html b/content/documentation/high-availability-framework-guide/index.html
index 71735e9..e5704ca 100644
--- a/content/documentation/high-availability-framework-guide/index.html
+++ b/content/documentation/high-availability-framework-guide/index.html
@@ -125,7 +125,7 @@ should consider include:</p>
example by crashing or by losing network connectivity. If the master has been
configured to use <a href="/documentation/latest/./high-availability/">high-availability mode</a>, this will
result in promoting another Mesos master replica to become the current
-leader. In this situation, the scheduler should re-register with the new
+leader. In this situation, the scheduler should reregister with the new
master and ensure that task state is consistent.</p></li>
<li><p>The host where a framework scheduler is running might fail. To ensure that the
framework remains available and can continue to schedule new tasks, framework
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/high-availability/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/high-availability/index.html b/content/documentation/high-availability/index.html
index 3fa720c..496c6ec 100644
--- a/content/documentation/high-availability/index.html
+++ b/content/documentation/high-availability/index.html
@@ -173,7 +173,7 @@
<ul>
<li><p>The agent fails health checks from the leader.</p></li>
<li><p>The leader marks the agent as deactivated and sends its tasks to the LOST state. The <a href="/documentation/latest/./app-framework-development-guide/">Framework Development Guide</a> describes these various task states.</p></li>
-<li><p>Deactivated agents may not re-register with the leader and are told to shut down upon any post-deactivation communication.</p></li>
+<li><p>Deactivated agents may not reregister with the leader and are told to shut down upon any post-deactivation communication.</p></li>
</ul>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/latest/agent-recovery/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/latest/agent-recovery/index.html b/content/documentation/latest/agent-recovery/index.html
index 9471b1f..2136b4f 100644
--- a/content/documentation/latest/agent-recovery/index.html
+++ b/content/documentation/latest/agent-recovery/index.html
@@ -206,10 +206,10 @@ not recovered.</li>
</ul>
-<p>A restarted agent should re-register with master within a timeout (75 seconds
+<p>A restarted agent should reregister with master within a timeout (75 seconds
by default: see the <code>--max_agent_ping_timeouts</code> and <code>--agent_ping_timeout</code>
<a href="/documentation/latest/./configuration/">configuration flags</a>). If the agent takes longer than this
-timeout to re-register, the master shuts down the agent, which in turn will
+timeout to reregister, the master shuts down the agent, which in turn will
shutdown any live executors/tasks.</p>
<p>Therefore, it is highly recommended to automate the process of restarting an
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/latest/app-framework-development-guide/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/latest/app-framework-development-guide/index.html b/content/documentation/latest/app-framework-development-guide/index.html
index bbe46d5..adee7ae 100644
--- a/content/documentation/latest/app-framework-development-guide/index.html
+++ b/content/documentation/latest/app-framework-development-guide/index.html
@@ -152,7 +152,7 @@ virtual void registered(
const MasterInfo& masterInfo);
/*
- * Invoked when the scheduler re-registers with a newly elected Mesos master.
+ * Invoked when the scheduler reregisters with a newly elected Mesos master.
* This is only called when the scheduler has previously been registered.
* `MasterInfo` containing the updated information about the elected master
* is provided as an argument.
@@ -489,7 +489,7 @@ virtual void registered(
const SlaveInfo& slaveInfo);
/*
- * Invoked when the executor re-registers with a restarted slave.
+ * Invoked when the executor reregisters with a restarted slave.
*/
virtual void reregistered(ExecutorDriver* driver, const SlaveInfo& slaveInfo);
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/latest/configuration/agent/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/latest/configuration/agent/index.html b/content/documentation/latest/configuration/agent/index.html
index 699fbaf..d382666 100644
--- a/content/documentation/latest/configuration/agent/index.html
+++ b/content/documentation/latest/configuration/agent/index.html
@@ -800,9 +800,9 @@ shutting it down (e.g., 60secs, 3mins, etc) (default: 1mins)
--executor_reregistration_timeout=VALUE
</td>
<td>
-The timeout within which an executor is expected to re-register after
+The timeout within which an executor is expected to reregister after
the agent has restarted, before the agent considers it gone and shuts
-it down. Note that currently, the agent will not re-register with the
+it down. Note that currently, the agent will not reregister with the
master until this timeout has elapsed (see MESOS-7539). (default: 2secs)
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/latest/configuration/master/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/latest/configuration/master/index.html b/content/documentation/latest/configuration/master/index.html
index 3a7d362..35fe5e1 100644
--- a/content/documentation/latest/configuration/master/index.html
+++ b/content/documentation/latest/configuration/master/index.html
@@ -273,11 +273,11 @@ checks. The value is of the form <code>(Number of agents)/(Duration)</code>.
--slave_reregister_timeout=VALUE
</td>
<td>
-The timeout within which an agent is expected to re-register.
-Agents re-register when they become disconnected from the master
+The timeout within which an agent is expected to reregister.
+Agents reregister when they become disconnected from the master
or when a new master is elected as the leader. Agents that do not
-re-register within the timeout will be marked unreachable in the
-registry; if/when the agent re-registers with the master, any
+reregister within the timeout will be marked unreachable in the
+registry; if/when the agent reregisters with the master, any
non-partition-aware tasks running on the agent will be terminated.
<b>NOTE</b>: This value has to be at least 10mins. (default: 10mins)
</td>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/latest/high-availability-framework-guide/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/latest/high-availability-framework-guide/index.html b/content/documentation/latest/high-availability-framework-guide/index.html
index 5d92dd9..fe5bed0 100644
--- a/content/documentation/latest/high-availability-framework-guide/index.html
+++ b/content/documentation/latest/high-availability-framework-guide/index.html
@@ -125,7 +125,7 @@ should consider include:</p>
example by crashing or by losing network connectivity. If the master has been
configured to use <a href="/documentation/latest/./high-availability/">high-availability mode</a>, this will
result in promoting another Mesos master replica to become the current
-leader. In this situation, the scheduler should re-register with the new
+leader. In this situation, the scheduler should reregister with the new
master and ensure that task state is consistent.</p></li>
<li><p>The host where a framework scheduler is running might fail. To ensure that the
framework remains available and can continue to schedule new tasks, framework
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/latest/high-availability/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/latest/high-availability/index.html b/content/documentation/latest/high-availability/index.html
index 98e4ed0..1a6ed5a 100644
--- a/content/documentation/latest/high-availability/index.html
+++ b/content/documentation/latest/high-availability/index.html
@@ -173,7 +173,7 @@
<ul>
<li><p>The agent fails health checks from the leader.</p></li>
<li><p>The leader marks the agent as deactivated and sends its tasks to the LOST state. The <a href="/documentation/latest/./app-framework-development-guide/">Framework Development Guide</a> describes these various task states.</p></li>
-<li><p>Deactivated agents may not re-register with the leader and are told to shut down upon any post-deactivation communication.</p></li>
+<li><p>Deactivated agents may not reregister with the leader and are told to shut down upon any post-deactivation communication.</p></li>
</ul>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/latest/maintenance/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/latest/maintenance/index.html b/content/documentation/latest/maintenance/index.html
index 688f8bd..a93a407 100644
--- a/content/documentation/latest/maintenance/index.html
+++ b/content/documentation/latest/maintenance/index.html
@@ -399,7 +399,7 @@ told to shutdown. These agents are removed from the master, which means that a
<code>TASK_LOST</code> status update will be sent for every task running on each of those
agents. The scheduler driver’s <code>slaveLost</code> callback will also be invoked for
each of the removed agents. Any agents on machines in maintenance are also
-prevented from re-registering with the master in the future (until maintenance
+prevented from reregistering with the master in the future (until maintenance
is completed and the machine is brought back up).</p>
<h3>Completing maintenance</h3>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/latest/monitoring/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/latest/monitoring/index.html b/content/documentation/latest/monitoring/index.html
index 62c2f06..63fd777 100644
--- a/content/documentation/latest/monitoring/index.html
+++ b/content/documentation/latest/monitoring/index.html
@@ -849,7 +849,7 @@ messages may indicate that there is a problem with the network.</p>
<td>
<code>master/recovery_slave_removals</code>
</td>
- <td>Number of agents not re-registered during master failover</td>
+ <td>Number of agents not reregistered during master failover</td>
<td>Counter</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/latest/operator-http-api/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/latest/operator-http-api/index.html b/content/documentation/latest/operator-http-api/index.html
index 7de7eac..0ad33f6 100644
--- a/content/documentation/latest/operator-http-api/index.html
+++ b/content/documentation/latest/operator-http-api/index.html
@@ -2382,7 +2382,7 @@ for all the running tasks. This signal can be used by stateful frameworks to
re-schedule their workloads (volumes, reservations etc.) to other agent
instances. It is possible that the tasks might still be running if the
operator’s assertion was wrong and the agent was partitioned away from
-the master. The agent would be shutdown when it tries to re-register with the
+the master. The agent would be shutdown when it tries to reregister with the
master when the partition heals. This call is idempotent.</p>
<pre><code>MARK_AGENT_GONE HTTP Request (JSON):
@@ -2462,7 +2462,7 @@ Transfer-Encoding: chunked
<h3>TASK_ADDED</h3>
-<p>Sent whenever a task has been added to the master. This can happen either when a new task launch is processed by the master or when an agent re-registers with a failed over master.</p>
+<p>Sent whenever a task has been added to the master. This can happen either when a new task launch is processed by the master or when an agent reregisters with a failed over master.</p>
<pre><code>TASK_ADDED Event (JSON)
@@ -2567,7 +2567,7 @@ Transfer-Encoding: chunked
<h3>FRAMEWORK_UPDATED</h3>
-<p>Sent whenever a framework re-registers with the master upon a disconnection (network error) or upon a master failover.</p>
+<p>Sent whenever a framework reregisters with the master upon a disconnection (network error) or upon a master failover.</p>
<pre><code>FRAMEWORK_UPDATED Event (JSON)
@@ -2610,7 +2610,7 @@ Transfer-Encoding: chunked
<h3>FRAMEWORK_REMOVED</h3>
-<p>Sent whenever a framework is removed. This can happen when a framework is explicitly teardown by the operator or if it fails to re-register with the master within the failover timeout.</p>
+<p>Sent whenever a framework is removed. This can happen when a framework is explicitly teardown by the operator or if it fails to reregister with the master within the failover timeout.</p>
<pre><code>FRAMEWORK_REMOVED Event (JSON)
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/latest/reconciliation/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/latest/reconciliation/index.html b/content/documentation/latest/reconciliation/index.html
index 13ab566..b9ef9f4 100644
--- a/content/documentation/latest/reconciliation/index.html
+++ b/content/documentation/latest/reconciliation/index.html
@@ -207,7 +207,7 @@ callback). For more information, see the
until an update is received for each task, using exponential backoff to retry
tasks that remain unreconciled. Retries are needed because the master temporarily
may not be able to reply for a particular task. For example, during master
-failover the master must re-register all of the agents to rebuild its
+failover the master must reregister all of the agents to rebuild its
set of known tasks (this process can take minutes for large clusters, and
is bounded by the <code>--agent_reregister_timeout</code> flag on the master).</p>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/latest/roles/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/latest/roles/index.html b/content/documentation/latest/roles/index.html
index 35c7686..7ce0a29 100644
--- a/content/documentation/latest/roles/index.html
+++ b/content/documentation/latest/roles/index.html
@@ -186,7 +186,7 @@ recommended practice is to only use ACLs to define which roles can be used; the
<p>A framework specifies which roles it would like to subscribe to when it
subscribes with the master. This is done via the <code>roles</code> field in
<code>FrameworkInfo</code>. A framework can also change which roles it is
-subscribed to by re-registering with an updated <code>FrameworkInfo</code>.</p>
+subscribed to by reregistering with an updated <code>FrameworkInfo</code>.</p>
<p>As a user, you can typically specify which role(s) a framework will
subscribe to when you start the framework. How to do this depends on the
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/latest/task-state-reasons/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/latest/task-state-reasons/index.html b/content/documentation/latest/task-state-reasons/index.html
index 118f2b2..6a1ae9e 100644
--- a/content/documentation/latest/task-state-reasons/index.html
+++ b/content/documentation/latest/task-state-reasons/index.html
@@ -574,7 +574,7 @@ update was sent.</p>
<tr><td><code> REASON_SLAVE_REREGISTERED
-</code></td><td> The agent on which the task was running has re-registered
+</code></td><td> The agent on which the task was running has reregistered
after being marked unreachable by the master.
<br/><strong> Note:
</strong> Due to garbage collection of the unreachable and gone agents
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/maintenance/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/maintenance/index.html b/content/documentation/maintenance/index.html
index 0f55a4f..e8a7ebe 100644
--- a/content/documentation/maintenance/index.html
+++ b/content/documentation/maintenance/index.html
@@ -399,7 +399,7 @@ told to shutdown. These agents are removed from the master, which means that a
<code>TASK_LOST</code> status update will be sent for every task running on each of those
agents. The scheduler driver’s <code>slaveLost</code> callback will also be invoked for
each of the removed agents. Any agents on machines in maintenance are also
-prevented from re-registering with the master in the future (until maintenance
+prevented from reregistering with the master in the future (until maintenance
is completed and the machine is brought back up).</p>
<h3>Completing maintenance</h3>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/monitoring/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/monitoring/index.html b/content/documentation/monitoring/index.html
index cb7998d..5d15562 100644
--- a/content/documentation/monitoring/index.html
+++ b/content/documentation/monitoring/index.html
@@ -849,7 +849,7 @@ messages may indicate that there is a problem with the network.</p>
<td>
<code>master/recovery_slave_removals</code>
</td>
- <td>Number of agents not re-registered during master failover</td>
+ <td>Number of agents not reregistered during master failover</td>
<td>Counter</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/operator-http-api/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/operator-http-api/index.html b/content/documentation/operator-http-api/index.html
index 8fd6da2..e5b593e 100644
--- a/content/documentation/operator-http-api/index.html
+++ b/content/documentation/operator-http-api/index.html
@@ -2382,7 +2382,7 @@ for all the running tasks. This signal can be used by stateful frameworks to
re-schedule their workloads (volumes, reservations etc.) to other agent
instances. It is possible that the tasks might still be running if the
operator’s assertion was wrong and the agent was partitioned away from
-the master. The agent would be shutdown when it tries to re-register with the
+the master. The agent would be shutdown when it tries to reregister with the
master when the partition heals. This call is idempotent.</p>
<pre><code>MARK_AGENT_GONE HTTP Request (JSON):
@@ -2462,7 +2462,7 @@ Transfer-Encoding: chunked
<h3>TASK_ADDED</h3>
-<p>Sent whenever a task has been added to the master. This can happen either when a new task launch is processed by the master or when an agent re-registers with a failed over master.</p>
+<p>Sent whenever a task has been added to the master. This can happen either when a new task launch is processed by the master or when an agent reregisters with a failed over master.</p>
<pre><code>TASK_ADDED Event (JSON)
@@ -2567,7 +2567,7 @@ Transfer-Encoding: chunked
<h3>FRAMEWORK_UPDATED</h3>
-<p>Sent whenever a framework re-registers with the master upon a disconnection (network error) or upon a master failover.</p>
+<p>Sent whenever a framework reregisters with the master upon a disconnection (network error) or upon a master failover.</p>
<pre><code>FRAMEWORK_UPDATED Event (JSON)
@@ -2610,7 +2610,7 @@ Transfer-Encoding: chunked
<h3>FRAMEWORK_REMOVED</h3>
-<p>Sent whenever a framework is removed. This can happen when a framework is explicitly teardown by the operator or if it fails to re-register with the master within the failover timeout.</p>
+<p>Sent whenever a framework is removed. This can happen when a framework is explicitly teardown by the operator or if it fails to reregister with the master within the failover timeout.</p>
<pre><code>FRAMEWORK_REMOVED Event (JSON)
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/reconciliation/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/reconciliation/index.html b/content/documentation/reconciliation/index.html
index 7806caa..167d3a6 100644
--- a/content/documentation/reconciliation/index.html
+++ b/content/documentation/reconciliation/index.html
@@ -207,7 +207,7 @@ callback). For more information, see the
until an update is received for each task, using exponential backoff to retry
tasks that remain unreconciled. Retries are needed because the master temporarily
may not be able to reply for a particular task. For example, during master
-failover the master must re-register all of the agents to rebuild its
+failover the master must reregister all of the agents to rebuild its
set of known tasks (this process can take minutes for large clusters, and
is bounded by the <code>--agent_reregister_timeout</code> flag on the master).</p>
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/roles/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/roles/index.html b/content/documentation/roles/index.html
index 816c26b..5647c52 100644
--- a/content/documentation/roles/index.html
+++ b/content/documentation/roles/index.html
@@ -186,7 +186,7 @@ recommended practice is to only use ACLs to define which roles can be used; the
<p>A framework specifies which roles it would like to subscribe to when it
subscribes with the master. This is done via the <code>roles</code> field in
<code>FrameworkInfo</code>. A framework can also change which roles it is
-subscribed to by re-registering with an updated <code>FrameworkInfo</code>.</p>
+subscribed to by reregistering with an updated <code>FrameworkInfo</code>.</p>
<p>As a user, you can typically specify which role(s) a framework will
subscribe to when you start the framework. How to do this depends on the
http://git-wip-us.apache.org/repos/asf/mesos-site/blob/e99c310c/content/documentation/task-state-reasons/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/task-state-reasons/index.html b/content/documentation/task-state-reasons/index.html
index c0fd9e3..122a0d3 100644
--- a/content/documentation/task-state-reasons/index.html
+++ b/content/documentation/task-state-reasons/index.html
@@ -574,7 +574,7 @@ update was sent.</p>
<tr><td><code> REASON_SLAVE_REREGISTERED
-</code></td><td> The agent on which the task was running has re-registered
+</code></td><td> The agent on which the task was running has reregistered
after being marked unreachable by the master.
<br/><strong> Note:
</strong> Due to garbage collection of the unreachable and gone agents