Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #367 Resolve remaining git.eclipse.org build references

This commit is contained in:
Jesse McConnell 2016-02-26 07:51:05 -06:00 committed by Joakim Erdfelt
parent 931f67baab
commit b08f177d47
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-server/src/main/config/modules/ssl.mod
View File

@ -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

4
jetty-start/src/test/resources/dist-home/modules/ssl.mod
View File

@ -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