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 2016/08/22 09:30:41 UTC
[43/50] [abbrv] karaf git commit: [KARAF-4653]a little cleanup
[KARAF-4653]a little cleanup
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2dd4b487
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2dd4b487
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2dd4b487
Branch: refs/heads/master
Commit: 2dd4b4875b0821382e24f005c4d63e62010d79d9
Parents: ca1f18e
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Aug 12 16:21:55 2016 +0800
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Aug 22 11:29:21 2016 +0200
----------------------------------------------------------------------
.../base/src/main/filtered-resources/resources/etc/jre.properties | 1 -
main/src/test/resources/test-karaf-home/etc/jre.properties | 1 -
2 files changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/2dd4b487/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
index 75fd93b..0ade1f6 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
@@ -737,4 +737,3 @@ jre-9= \
org.xml.sax.ext, \
org.xml.sax.helpers
->>>>>>> d98bccb... [ENTESB-5190]run karaf with java9-first commit
http://git-wip-us.apache.org/repos/asf/karaf/blob/2dd4b487/main/src/test/resources/test-karaf-home/etc/jre.properties
----------------------------------------------------------------------
diff --git a/main/src/test/resources/test-karaf-home/etc/jre.properties b/main/src/test/resources/test-karaf-home/etc/jre.properties
index 640d974..3bc13ec 100644
--- a/main/src/test/resources/test-karaf-home/etc/jre.properties
+++ b/main/src/test/resources/test-karaf-home/etc/jre.properties
@@ -736,4 +736,3 @@ jre-9= \
org.xml.sax, \
org.xml.sax.ext, \
org.xml.sax.helpers
->>>>>>> d98bccb... [ENTESB-5190]run karaf with java9-first commit