Repository: karaf
Updated Branches:
  refs/heads/karaf-2.x 392dbc773 -> 3e7582d28


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

Branch: refs/heads/karaf-2.x
Commit: 3e7582d286dcfdc4ba77f214f7c633bb97320814
Parents: 392dbc7
Author: Jean-Baptiste Onofré <[email protected]>
Authored: Thu Jun 18 17:24:56 2015 +0200
Committer: Jean-Baptiste Onofré <[email protected]>
Committed: Thu Jun 18 17:24:56 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/karaf/blob/3e7582d2/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties
----------------------------------------------------------------------
diff --git 
a/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties 
b/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties
index 36e0b18..89f3947 100644
--- a/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties
+++ b/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties
@@ -115,3 +115,16 @@ 
karaf.secured.services=(&(osgi.command.scope=*)(osgi.command.function=*))
 #java.security.policy=${karaf.home}/etc/all.policy
 #org.osgi.framework.security=osgi
 #org.osgi.framework.trust.repositories=${karaf.home}/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

Reply via email to