Merge remote-tracking branch 'origin/master' into 2.3.0

This commit is contained in:
wing328 2017-07-14 16:31:44 +08:00
commit 804967eeed

View File

@ -77,7 +77,6 @@
<stopPort>8079</stopPort> <stopPort>8079</stopPort>
<stopKey>stopit</stopKey> <stopKey>stopit</stopKey>
<httpConnector> <httpConnector>
<port>8080</port>
<idleTimeout>60000</idleTimeout> <idleTimeout>60000</idleTimeout>
</httpConnector> </httpConnector>
</configuration> </configuration>