[activemq-activeio] 03/07: Merge tag 'upstream/3.1.4'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository activemq-activeio.

commit 6f752dee97471f3a32fa028a915b3ad77385b500
Merge: 52d6413 bd9cbff
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Mar 20 22:03:35 2016 +0100

    Merge tag 'upstream/3.1.4'
    
    Upstream version 3.1.4

 activeio-core/pom.xml                              |  8 +++-
 .../activeio/journal/active/LogFileManager.java    |  1 +
 pom.xml                                            | 54 ++++++++++++++++------
 3 files changed, 48 insertions(+), 15 deletions(-)

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