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 2015/06/18 17:21:24 UTC

karaf git commit: [KARAF-3790] Add comment describing karaf.lock.dir property in etc/system.properties

Repository: karaf
Updated Branches:
  refs/heads/master 34b1e9b8c -> 994ddcdad


[KARAF-3790] Add comment describing karaf.lock.dir property in etc/system.properties


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/994ddcda
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/994ddcda
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/994ddcda

Branch: refs/heads/master
Commit: 994ddcdadc7b4463e47de8d55bc8b13f4bd9743a
Parents: 34b1e9b
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Jun 18 17:20:52 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Jun 18 17:20:52 2015 +0200

----------------------------------------------------------------------
 .../src/main/resources/resources/etc/system.properties | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/994ddcda/assemblies/features/base/src/main/resources/resources/etc/system.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/etc/system.properties b/assemblies/features/base/src/main/resources/resources/etc/system.properties
index b6a442b..cff4250 100644
--- a/assemblies/features/base/src/main/resources/resources/etc/system.properties
+++ b/assemblies/features/base/src/main/resources/resources/etc/system.properties
@@ -123,3 +123,16 @@ karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*))
 #java.security.policy=${karaf.etc}/all.policy
 #org.osgi.framework.security=osgi
 #org.osgi.framework.trust.repositories=${karaf.etc}/trustStore.ks
+
+#
+# HA/Lock configuration
+#
+# Karaf uses a lock mechanism to know which instance is the master (HA)
+# The lock can be on the filesystem (default) or on a database.
+#
+# See http://karaf.apache.org/manual/latest/users-guide/failover.html for details.
+#
+# Even using a single instance, Karaf creates the lock file
+# You can specify the location of the lock file using the
+# karaf.lock.dir=/path/to/the/directory/containing/the/lock
+#
\ No newline at end of file