Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2016-02-26 08:51:05 -0500
committerJoakim Erdfelt2016-02-26 10:09:12 -0500
commitb08f177d47d08950ef814f8a6a08450ced7f3c53 (patch)
tree8f95acfbbd2303b8a58c18bffb7e769cf1bce2e9
parent931f67baab5f8eee5a5f1efecc22541414ad6c66 (diff)
downloadorg.eclipse.jetty.project-b08f177d47d08950ef814f8a6a08450ced7f3c53.tar.gz
org.eclipse.jetty.project-b08f177d47d08950ef814f8a6a08450ced7f3c53.tar.xz
org.eclipse.jetty.project-b08f177d47d08950ef814f8a6a08450ced7f3c53.zip
Issue #367 Resolve remaining git.eclipse.org build references
-rw-r--r--jetty-server/src/main/config/modules/ssl.mod4
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/ssl.mod4
2 files changed, 8 insertions, 0 deletions
diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod
index ef471929f3..2e90560f7d 100644
--- a/jetty-server/src/main/config/modules/ssl.mod
+++ b/jetty-server/src/main/config/modules/ssl.mod
@@ -9,7 +9,11 @@ server
etc/jetty-ssl.xml
[files]
+<<<<<<< HEAD
http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore
+=======
+https://raw.githubusercontent.com/eclipse/jetty.project/master/jetty-server/src/test/config/etc/keystore?id=${jetty.tag.version}|etc/keystore
+>>>>>>> 76b34fe... Issue #367 Resolve remaining git.eclipse.org build references
[ini-template]
### SSL Keystore Configuration
diff --git a/jetty-start/src/test/resources/dist-home/modules/ssl.mod b/jetty-start/src/test/resources/dist-home/modules/ssl.mod
index ef471929f3..2e90560f7d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/ssl.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/ssl.mod
@@ -9,7 +9,11 @@ server
etc/jetty-ssl.xml
[files]
+<<<<<<< HEAD
http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore
+=======
+https://raw.githubusercontent.com/eclipse/jetty.project/master/jetty-server/src/test/config/etc/keystore?id=${jetty.tag.version}|etc/keystore
+>>>>>>> 76b34fe... Issue #367 Resolve remaining git.eclipse.org build references
[ini-template]
### SSL Keystore Configuration

Back to the top