Repository: servicemix Updated Branches: refs/heads/master 0372131e5 -> e79866d7c
SM-2768: Upgrade to Apache Karaf 4 - update some missing changes Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/e79866d7 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/e79866d7 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/e79866d7 Branch: refs/heads/master Commit: e79866d7c97d2947fb5cdc60c62f8256e7cac8ac Parents: 0372131 Author: Krzysztof Sobkowiak <[email protected]> Authored: Tue Feb 23 21:17:50 2016 +0100 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Tue Feb 23 21:17:50 2016 +0100 ---------------------------------------------------------------------- .../apache-servicemix/src/main/resources/etc/system.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/e79866d7/assemblies/apache-servicemix/src/main/resources/etc/system.properties ---------------------------------------------------------------------- diff --git a/assemblies/apache-servicemix/src/main/resources/etc/system.properties b/assemblies/apache-servicemix/src/main/resources/etc/system.properties index 29b18af..f5f6029 100644 --- a/assemblies/apache-servicemix/src/main/resources/etc/system.properties +++ b/assemblies/apache-servicemix/src/main/resources/etc/system.properties @@ -143,7 +143,10 @@ karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*)) # You can specify the location of the lock file using the # karaf.lock.dir=/path/to/the/directory/containing/the/lock # - +# By default, the slave instances start but are passive. +# If you want to prevent the slave instances startup, you can use +# the karaf.lock.slave.block property (false by default): +# karaf.lock.slave.block=true # # Default port for the OSGI HTTP Service
