Merge branch 'master' into 2.0.x

This commit is contained in:
Spencer Gibb
2017-10-20 17:22:15 -04:00
8 changed files with 171 additions and 6 deletions

View File

@@ -1164,12 +1164,14 @@ server {
}
----
NOTE: just like the source files for environment configuration, the
NOTE: Just like the source files for environment configuration, the
"profile" is used to resolve the file name, so if you want a
profile-specific file then `/\*/development/*/logback.xml` will be
resolved by a file called `logback-development.xml` (in preference
to `logback.xml`).
NOTE: If you do not want to supply the `label` and let the server use the default label, you can supply a `useDefaultLabel` request parameter. So, the above example for the `default` profile could look like `/foo/default/nginx.conf?useDefaultLabel`.
== Embedding the Config Server
The Config Server runs best as a standalone application, but if you