Repository: activemq Updated Branches: refs/heads/activemq-5.14.x b1c09d9a8 -> 4808b35b5
https://issues.apache.org/jira/browse/AMQ-6442 Config file org.apache.activemq.server-default.cfg points config to ${karaf.base}/etc (cherry picked from commit 132840b09fbf0a071c51d357d12e13999925df25) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4808b35b Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4808b35b Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4808b35b Branch: refs/heads/activemq-5.14.x Commit: 4808b35b5f16b11f4d1e7a5951a56bf1f0257668 Parents: b1c09d9 Author: Krzysztof Sobkowiak <[email protected]> Authored: Mon Sep 26 22:15:23 2016 +0200 Committer: Christopher L. Shannon (cshannon) <[email protected]> Committed: Tue Sep 27 08:00:01 2016 -0400 ---------------------------------------------------------------------- .../src/main/resources/org.apache.activemq.server-default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/4808b35b/activemq-karaf/src/main/resources/org.apache.activemq.server-default.cfg ---------------------------------------------------------------------- diff --git a/activemq-karaf/src/main/resources/org.apache.activemq.server-default.cfg b/activemq-karaf/src/main/resources/org.apache.activemq.server-default.cfg index ed9715a..19aec4e 100644 --- a/activemq-karaf/src/main/resources/org.apache.activemq.server-default.cfg +++ b/activemq-karaf/src/main/resources/org.apache.activemq.server-default.cfg @@ -17,4 +17,4 @@ broker-name=amq-broker data=${karaf.data}/${broker-name} -config=${karaf.base}/etc/activemq.xml \ No newline at end of file +config=${karaf.etc}/activemq.xml
