Sync docs from master to gh-pages

This commit is contained in:
Dave Syer
2016-06-11 08:59:31 +00:00
parent c6152bdafa
commit f69b4d212c

View File

@@ -1432,7 +1432,7 @@ Spring Cloud Config provides server and client-side support for externalized con
<div class="listingblock">
<div class="content">
<pre>$ cd spring-cloud-config-server
$ mvn spring-boot:run</pre>
$ ../mvnw spring-boot:run</pre>
</div>
</div>
<div class="paragraph">
@@ -3728,7 +3728,7 @@ for details on the properties available.</p>
<div class="title">Note</div>
</td>
<td class="content">
by default the native Netflix behaviour built into Turbine does <em>not</em> allow multiple processes per host, per cluster (the key to the instance id is the hostname). Spring Cloud generalizes this a bit, allowing the host and port to be used as the key, but only if you set the property <code>turbine.combineHostPort=true</code>
by default Spring Cloud allows Turbine to use the host and port to allow multiple processes per host, per cluster. If you want the native Netflix behaviour built into Turbine that does <em>not</em> allow multiple processes per host, per cluster (the key to the instance id is the hostname), then set the property <code>turbine.combineHostPort=false</code>.
</td>
</tr>
</table>
@@ -9489,10 +9489,10 @@ To disable Zuul support set the <code>spring.sleuth.zuul.enabled</code> property
<div class="ulist">
<ul>
<li>
<p><a href="http://docssleuth-zipkin-server.cfapps.io/">Zipkin for apps presented in the samples to the top</a>, its <a href="https://github.com/spring-cloud-samples/sleuth-documentation-apps">Github Code</a> and its build status <span class="image"><a class="image" href="https://build.spring.io/browse/SCE2E-SCSDAOCF"><img src="https://build.spring.io/plugins/servlet/buildStatusImage/SCE2E-SCSDAOCF" alt="Build Status"></a></span></p>
<p><a href="http://docssleuth-zipkin-server.cfapps.io/">Zipkin for apps presented in the samples to the top</a></p>
</li>
<li>
<p><a href="http://docsbrewing-zipkin-web.cfapps.io/">Zipkin for Brewery on PWS</a>, its <a href="https://github.com/spring-cloud-samples/brewery">Github Code</a> and its build status <span class="image"><a class="image" href="https://build.spring.io/browse/SCE2E-SCSBFDOCF"><img src="https://build.spring.io/plugins/servlet/buildStatusImage/SCE2E-SCSSE2ECFT" alt="Build Status"></a></span></p>
<p><a href="http://docsbrewing-zipkin-web.cfapps.io/">Zipkin for Brewery on PWS</a>, its <a href="https://github.com/spring-cloud-samples/brewery">Github Code</a></p>
</li>
</ul>
</div>
@@ -13074,7 +13074,7 @@ created during auto-configuration.</p>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2016-05-18 09:45:16 +01:00
Last updated 2016-06-11 08:58:08 UTC
</div>
</div>
</body>