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:20 UTC
[05/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/e49e3e5f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e49e3e5f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e49e3e5f
Branch: refs/heads/master
Commit: e49e3e5f85b1844ee548f136a77a8569b47e297a
Parents: 787dbd9 6e376ce
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Dec 18 11:18:00 2013 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Dec 18 11:18:00 2013 +0100
----------------------------------------------------------------------
.../main/filtered-resources/resources/bin/karaf | 2 +-
.../filtered-resources/resources/bin/karaf.bat | 2 +-
.../core/internal/InstanceServiceImpl.java | 8 +-
.../org/apache/karaf/main/ConfigProperties.java | 9 +-
.../apache/karaf/main/lock/DefaultJDBCLock.java | 109 +++-
.../apache/karaf/main/lock/GenericJDBCLock.java | 589 +++++++++++++++++++
.../karaf/main/lock/GenericStatements.java | 243 ++++++++
7 files changed, 928 insertions(+), 34 deletions(-)
----------------------------------------------------------------------