From d7fc103cce89d0f54d68f35d26e2e4b8c448078e Mon Sep 17 00:00:00 2001
From: Matt Duftler <duftler@google.com>
Date: Wed, 26 Jun 2019 13:29:12 -0400
Subject: [PATCH] fix(config): Do not override default Spring config locations.
 (#575)

---
 kayenta-web/src/main/java/com/netflix/kayenta/Main.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kayenta-web/src/main/java/com/netflix/kayenta/Main.java b/kayenta-web/src/main/java/com/netflix/kayenta/Main.java
index 8c0c7e928..fd391ba42 100644
--- a/kayenta-web/src/main/java/com/netflix/kayenta/Main.java
+++ b/kayenta-web/src/main/java/com/netflix/kayenta/Main.java
@@ -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");