diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-10-23 20:42:58 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@oath.com> | 2018-10-23 20:42:58 +0200 |
| commit | 098f7fd34dfb3cdbb7f05c0bfe635c2f39cea2b3 (patch) | |
| tree | 1bd87252dfb71c39e1dc448349a22579eefe06f2 /configserver/src | |
| parent | e678ffc025674df331f478064542db22fd7e4dd5 (diff) | |
| parent | 1a8bbf7434e13271f10862aa3c0057f30122ad0c (diff) | |
Merge with master
Diffstat (limited to 'configserver/src')
| -rw-r--r-- | configserver/src/main/resources/configserver-app/services.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml index 60dd7b0cea2..511cde23e89 100644 --- a/configserver/src/main/resources/configserver-app/services.xml +++ b/configserver/src/main/resources/configserver-app/services.xml @@ -192,5 +192,7 @@ <preprocess:include file='configserver-config.xml' required='false' /> <preprocess:include file='configserver-components.xml' required='false' /> + + <preprocess:include file='zookeeper-server-config.xml' required='false' /> </jdisc> </services> |