Merge branch 'master' into doc
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/30c0d563 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/30c0d563 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/30c0d563 Branch: refs/heads/master Commit: 30c0d563a5f865f630b47bbfde8fcaf521bacf9a Parents: 1a1b57c d6251d5 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Dec 19 15:05:22 2013 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Dec 19 15:05:22 2013 +0100 ---------------------------------------------------------------------- .../apache/karaf/jms/command/BrowseCommand.java | 8 +---- .../java/org/apache/karaf/jms/JmsMessage.java | 37 ++++++++++++-------- .../apache/karaf/jms/internal/JmsMBeanImpl.java | 2 +- .../karaf/jms/internal/JmsServiceImpl.java | 1 + 4 files changed, 26 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
