Updated Branches: refs/heads/master 36f092e9e -> 65c064e18
[KARAF-2638] Rollback the ServiceMix Specs timeout to 100 for give time to investigate Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/65c064e1 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/65c064e1 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/65c064e1 Branch: refs/heads/master Commit: 65c064e18d9f4332a7e7a7beb04e248aafc995bb Parents: 36f092e Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Dec 20 17:02:55 2013 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Dec 20 17:02:55 2013 +0100 ---------------------------------------------------------------------- .../framework/src/main/resources/resources/etc/system.properties | 2 +- .../org/apache/karaf/instance/resources/etc/system.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/65c064e1/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 98d1163..b1ee30e 100644 --- a/assemblies/features/framework/src/main/resources/resources/etc/system.properties +++ b/assemblies/features/framework/src/main/resources/resources/etc/system.properties @@ -92,7 +92,7 @@ jline.nobell = true # ServiceMix specs options # org.apache.servicemix.specs.debug = false -org.apache.servicemix.specs.timeout = 0 +org.apache.servicemix.specs.timeout = 100 # # Settings for the OSGi 4.3 Weaving http://git-wip-us.apache.org/repos/asf/karaf/blob/65c064e1/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties ---------------------------------------------------------------------- diff --git a/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties b/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties index 14687c6..0f033e7 100644 --- a/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties +++ b/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties @@ -94,7 +94,7 @@ jline.nobell=true # ServiceMix specs options # org.apache.servicemix.specs.debug=false -org.apache.servicemix.specs.timeout=0 +org.apache.servicemix.specs.timeout=100 # # Settings for the OSGi 4.3 Weaving
