You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/06/21 15:18:17 UTC
[1/2] activemq-artemis git commit: NO-JIRA fix typos
Repository: activemq-artemis
Updated Branches:
refs/heads/master ae8fbbdef -> 7583ff717
NO-JIRA fix typos
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3d4e907a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3d4e907a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3d4e907a
Branch: refs/heads/master
Commit: 3d4e907a1b0ee887aaa1c30d42390621734a96cf
Parents: ae8fbbd
Author: Jiri Danek <jd...@redhat.com>
Authored: Mon May 29 10:43:48 2017 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jun 21 11:16:29 2017 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java | 2 +-
.../artemis/core/postoffice/impl/WildcardAddressManager.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3d4e907a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java
index 472f16f..a361109 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java
@@ -39,7 +39,7 @@ public interface ActiveMQJournalBundle {
@Message(id = 149001, value = "Journal data belong to a different version")
ActiveMQIOErrorException journalDifferentVersion();
- @Message(id = 149002, value = "Journal files version mismatch. You should export the data from the previous version and import it as explained on the user''s manual")
+ @Message(id = 149002, value = "Journal files version mismatch. You should export the data from the previous version and import it as explained on the user's manual")
ActiveMQIOErrorException journalFileMisMatch();
@Message(id = 149003, value = "File not opened")
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3d4e907a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
index 516cf37..d0854de 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
@@ -35,7 +35,7 @@ import org.apache.activemq.artemis.core.transaction.Transaction;
public class WildcardAddressManager extends SimpleAddressManager {
/**
- * These are all the addresses, we use this so we can link back from the actual address to its linked wilcard addresses
+ * These are all the addresses, we use this so we can link back from the actual address to its linked wildcard addresses
* or vice versa
*/
private final Map<SimpleString, Address> addresses = new ConcurrentHashMap<>();
[2/2] activemq-artemis git commit: This closes #1356
Posted by cl...@apache.org.
This closes #1356
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7583ff71
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7583ff71
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7583ff71
Branch: refs/heads/master
Commit: 7583ff7172abf9ccf7a4d6ee572f7e576cd73fac
Parents: ae8fbbd 3d4e907
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Jun 21 11:16:30 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jun 21 11:16:30 2017 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java | 2 +-
.../artemis/core/postoffice/impl/WildcardAddressManager.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------