You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2016/09/27 11:58:27 UTC
[1/2] activemq git commit:
https://issues.apache.org/jira/browse/AMQ-6442
Repository: activemq
Updated Branches:
refs/heads/master e8ba0b011 -> 20f27f22b
https://issues.apache.org/jira/browse/AMQ-6442
Config file org.apache.activemq.server-default.cfg points config to ${karaf.base}/etc
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/132840b0
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/132840b0
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/132840b0
Branch: refs/heads/master
Commit: 132840b09fbf0a071c51d357d12e13999925df25
Parents: e8ba0b0
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Sep 26 22:15:23 2016 +0200
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Tue Sep 27 07:57:33 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/132840b0/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
[2/2] activemq git commit:
https://issues.apache.org/jira/browse/AMQ-6442
Posted by cs...@apache.org.
https://issues.apache.org/jira/browse/AMQ-6442
Merging AMQ-6442
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/20f27f22
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/20f27f22
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/20f27f22
Branch: refs/heads/master
Commit: 20f27f22b947f15f326f0369176594cf80120325
Parents: e8ba0b0 132840b
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Tue Sep 27 07:57:43 2016 -0400
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Tue Sep 27 07:57:43 2016 -0400
----------------------------------------------------------------------
.../src/main/resources/org.apache.activemq.server-default.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------