[activemq] 04/05: Merge tag 'upstream/5.6.0+dfsg1'

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository activemq.

commit fde34c22c80c3265f04c9f1061c17b2b4daac422
Merge: d08c8d9 43a6b47
Author: tony mancill <tmancill at debian.org>
Date:   Wed Aug 27 13:25:46 2014 -0700

    Merge tag 'upstream/5.6.0+dfsg1'
    
    Upstream version 5.6.0+dfsg1
    
    Conflicts:
    	activemq-ra/src/test/java/org/apache/activemq/ra/JmsXAQueueTransactionTest.java
    	activemq-ra/src/test/java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java
    	kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
    
    This resolves yet more inconsistencies (in comment datestamps only)
    with commit 6e998dee5c41741b4cd1e6b008e1ae27ef84e7.

 .../test/java/org/apache/activemq/ra/JmsXAQueueTransactionTest.java | 2 +-
 .../org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java     | 4 ++--
 kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java        | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --cc activemq-ra/src/test/java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java
index f32f374,60f2732..db2d7c7
--- a/activemq-ra/src/test/java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java
+++ b/activemq-ra/src/test/java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java
@@@ -169,4 -169,4 +169,4 @@@ public class JmsXARollback2CxTransactio
  
      }
  
--}
++}
diff --cc kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
index 652a6b1,07f5761..5f2e7a4
--- a/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
+++ b/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
@@@ -64,7 -64,7 +64,11 @@@ public class BTreeIndex<Key,Value> impl
      /**
       * Interface used to determine the simple prefix of two keys.
       *
++<<<<<<< HEAD
 +     * , $Date: 2011-02-16 13:58:54 +0000 (Wed, 16 Feb 2011) $
++=======
+      * , $Date: 2011-02-16 05:58:54 -0800 (Wed, 16 Feb 2011) $
++>>>>>>> upstream/5.6.0+dfsg1
       */
      static public interface Prefixer<Key> {
          

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq.git