Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x

2017-05-09 17:17:34 -07:00 · 2017-05-09 17:17:34 -07:00 · 9f5909b98b
parent 753ed9e603 e091701bcd
commit 9f5909b98b
3 changed files with 3 additions and 3 deletions
--- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod
@ -13,6 +13,6 @@ GCloudDatastore is an open source project hosted on Github and released under th
 https://github.com/GoogleCloudPlatform/gcloud-java
 http://www.apache.org/licenses/LICENSE-2.0.html

-[ini-template]
+[ini]
 ## Hide the gcloud libraries from deployed webapps
 jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/gcloud/
--- a/jetty-home/src/main/resources/modules/jminix.mod
+++ b/jetty-home/src/main/resources/modules/jminix.mod
@ -41,5 +41,5 @@ http://www.apache.org/licenses/LICENSE-2.0

 [ini-template]
 ## Jminix Configuration
-jminix.port=8088
+# jminix.port=8088

--- a/jetty-server/src/main/config/modules/stats.mod
+++ b/jetty-server/src/main/config/modules/stats.mod
@ -11,5 +11,5 @@ server
 [xml]
 etc/jetty-stats.xml

-[ini-template]
+[ini]
 jetty.webapp.addServerClasses+=,-org.eclipse.jetty.servlet.StatisticsServlet