You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2017/06/02 16:15:10 UTC
[1/2] activemq-artemis git commit: This closes #1314
Repository: activemq-artemis
Updated Branches:
refs/heads/master 2aeb79710 -> 7036e5038
This closes #1314
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7036e503
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7036e503
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7036e503
Branch: refs/heads/master
Commit: 7036e50383aee1494226f84e9ea692ec0eddb421
Parents: 2aeb797 a349493
Author: Justin Bertram <jb...@apache.org>
Authored: Fri Jun 2 11:14:09 2017 -0500
Committer: Justin Bertram <jb...@apache.org>
Committed: Fri Jun 2 11:14:09 2017 -0500
----------------------------------------------------------------------
.../org/apache/activemq/artemis/cli/commands/etc/broker.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: NO-JIRA: Improve docs on broker.xml
Posted by jb...@apache.org.
NO-JIRA: Improve docs on broker.xml
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a3494939
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a3494939
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a3494939
Branch: refs/heads/master
Commit: a349493963346e324222d6504f69bba3e2956c01
Parents: 2aeb797
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Jun 2 11:23:30 2017 -0400
Committer: Justin Bertram <jb...@apache.org>
Committed: Fri Jun 2 11:14:09 2017 -0500
----------------------------------------------------------------------
.../org/apache/activemq/artemis/cli/commands/etc/broker.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3494939/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index 6276b76..603938a 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -29,7 +29,10 @@ under the License.
<persistence-enabled>${persistence-enabled}</persistence-enabled>
- <!-- this could be ASYNCIO or NIO
+ <!-- this could be ASYNCIO, MAPPED, NIO
+ ASYNCIO: Linux Libaio
+ MAPPED: mmap files
+ NIO: Plain Java Files
-->
<journal-type>${journal.settings}</journal-type>