Merge Consul OSS branch 'master' at commit a58d8e91ac258c04174afca3818cbdae23aa8d3f

agent/proxycfg/manager_test.go

@@ -269,7 +269,7 @@ func assertWatchChanRecvs(t *testing.T, ch <-chan *ConfigSnapshot, expect *Confi
 		if expect == nil {
 			require.False(t, ok, "watch chan should be closed")
 		}
-	case <-time.After(50*time.Millisecond + coalesceTimeout):
+	case <-time.After(100*time.Millisecond + coalesceTimeout):
 		t.Fatal("recv timeout")
 	}
 }

website/source/docs/connect/proxies/envoy.md

@@ -132,8 +132,7 @@ configuration entry](/docs/agent/config_entries.html#proxy-defaults-proxy-defaul
   available interfaces or a pod IP address.
 
     -> **Note:** Envoy versions prior to 1.10 do not export timing histograms
-    using the internal Prometheus endpoint. Consul 1.5.0 [doesn't yet support
-    Envoy 1.10](#supported-versions) although support will soon be added.
+    using the internal Prometheus endpoint.
 
 - `envoy_stats_tags` - Specifies one or more static tags that will be added to
   all metrics produced by the proxy.

website/source/docs/internals/consensus.html.md

@@ -11,7 +11,7 @@ description: |-
 Consul uses a [consensus protocol](https://en.wikipedia.org/wiki/Consensus_(computer_science))
 to provide [Consistency (as defined by CAP)](https://en.wikipedia.org/wiki/CAP_theorem).
 The consensus protocol is based on
-["Raft: In search of an Understandable Consensus Algorithm"](https://ramcloud.stanford.edu/wiki/download/attachments/11370504/raft.pdf).
+["Raft: In search of an Understandable Consensus Algorithm"](https://raft.github.io/raft.pdf).
 For a visual explanation of Raft, see [The Secret Lives of Data](http://thesecretlivesofdata.com/raft).
 
 ## Raft Protocol Overview
@@ -51,7 +51,7 @@ and managing when an entry is considered committed.
 
 Raft is a complex protocol and will not be covered here in detail (for those who
 desire a more comprehensive treatment, the full specification is available in this
-[paper](https://ramcloud.stanford.edu/wiki/download/attachments/11370504/raft.pdf)).
+[paper](https://raft.github.io/raft.pdf)).
 We will, however, attempt to provide a high level description which may be useful
 for building a mental model.