Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x 5b5697d02 -> 42a081d34


[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/42a081d3
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/42a081d3
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/42a081d3

Branch: refs/heads/karaf-3.0.x
Commit: 42a081d34bd54b83e7738541717a247ae4dedd34
Parents: 5b5697d
Author: Jean-Baptiste Onofré <[email protected]>
Authored: Thu Jun 18 17:20:52 2015 +0200
Committer: Jean-Baptiste Onofré <[email protected]>
Committed: Thu Jun 18 17:21:56 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/42a081d3/assemblies/features/framework/src/main/resources/resources/etc/system.properties
----------------------------------------------------------------------
diff --git 
a/assemblies/features/framework/src/main/resources/resources/etc/system.properties
 
b/assemblies/features/framework/src/main/resources/resources/etc/system.properties
index 9b160f0..6ceb39a 100644
--- 
a/assemblies/features/framework/src/main/resources/resources/etc/system.properties
+++ 
b/assemblies/features/framework/src/main/resources/resources/etc/system.properties
@@ -118,3 +118,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
+#

Reply via email to