You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/12/19 15:31:25 UTC
[10/19] git commit: Merge branch 'master' into jms_doc
Merge branch 'master' into jms_doc
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/43cf6575
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/43cf6575
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/43cf6575
Branch: refs/heads/master
Commit: 43cf657535082f5e4a852e175daade965aaea54d
Parents: 773079b 9c8f533
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Dec 18 21:38:51 2013 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Dec 18 21:38:51 2013 +0100
----------------------------------------------------------------------
.../connectionFactory-webspheremq.xml | 20 --------------
.../connectionfactory-activemq.xml | 28 --------------------
.../jms/internal/connectionfactory-activemq.xml | 28 ++++++++++++++++++++
.../internal/connectionfactory-webspheremq.xml | 20 ++++++++++++++
pom.xml | 2 +-
5 files changed, 49 insertions(+), 49 deletions(-)
----------------------------------------------------------------------