Skip to content

Commit

Permalink
fix(config): Do not override default Spring config locations. (#575)
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Duftler committed Jun 26, 2019
1 parent 23d9c51 commit d7fc103
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kayenta-web/src/main/java/com/netflix/kayenta/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private static Map<String, Object> buildDefaults() {
defaults.put("netflix.environment", "test");
defaults.put("netflix.account", "${netflix.environment}");
defaults.put("netflix.stack", "test");
defaults.put("spring.config.location", "${user.home}/.spinnaker/");
defaults.put("spring.config.additional-location", "${user.home}/.spinnaker/");
defaults.put("spring.application.name", "kayenta");
defaults.put("spring.config.name", "spinnaker,${spring.application.name}");
defaults.put("spring.profiles.active", "${netflix.environment},local");
Expand Down

0 comments on commit d7fc103

Please sign in to comment.