Merge branch 'master' into 2.0.x

This commit is contained in:
Spencer Gibb
2017-11-21 19:19:50 -05:00
7 changed files with 130 additions and 10 deletions

View File

@@ -12,7 +12,7 @@ public class PropertySourceBootstrapProperties {
private boolean overrideSystemProperties = true;
/**
* Flag to indicate that {@link #isSystemPropertiesOverride()
* Flag to indicate that {@link #isOverrideSystemProperties()
* systemPropertiesOverride} can be used. Set to false to prevent users from changing
* the default accidentally. Default true.
*/