Commit Graph

13498 Commits

Author SHA1 Message Date
Joakim Erdfelt 56634b26b1 Merge branch 'jetty-9.4.x' 2016-09-20 15:04:12 -07:00
Joakim Erdfelt caa06d54e8 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-20 15:03:49 -07:00
Joakim Erdfelt b0880f617a Merge branch 'release-9.3.12' into jetty-9.3.x 2016-09-20 14:39:08 -07:00
Joakim Erdfelt 8d75570b1a Merge branch 'release-9.4.0.RC0' into jetty-9.4.x 2016-09-20 14:38:34 -07:00
Joakim Erdfelt 15cb25bb7d Merge branch 'jetty-9.4.x' 2016-09-20 13:01:50 -07:00
Joakim Erdfelt 8432e4e2c7 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-20 13:01:32 -07:00
Joakim Erdfelt 5f41e972aa Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-09-20 13:01:14 -07:00
Joakim Erdfelt e0c433c831 Adding timeout for compile and javadoc 2016-09-20 13:00:57 -07:00
Simone Bordet a13a35cf25 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-16 11:35:51 +02:00
Simone Bordet ef9b887ab5 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-16 11:35:33 +02:00
Simone Bordet 9848b33ec9 Fixes #915 - The jetty-maven-plugin:stop goal doesn't stop everything completely.
Closing the serverSocket when exiting ShutdownMonitorRunnable.
2016-09-16 11:33:21 +02:00
Simone Bordet 4f533f39be Merged branch 'jetty-9.4.x' into 'master'. 2016-09-16 10:38:25 +02:00
Simone Bordet 82aec3986e Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-16 10:37:45 +02:00
Olivier Lamy 1bf87b317b Add support of a query param to reset stats of StatisticsHandler tru StatisticsServlet (#919)
StatisticsServlet: support a new parameter to be able to reset stats

Signed-off-by: olivier lamy <olamy@webtide.com>
2016-09-16 10:36:33 +02:00
Simone Bordet f7816a6ea4 Improved logging. 2016-09-16 10:31:01 +02:00
Greg Wilkins f2737b1737 Issue #788 unit test 2016-09-16 17:18:32 +10:00
Greg Wilkins 98da23c374 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-09-16 17:17:02 +10:00
Greg Wilkins 70705a5ac1 Issue #788 Already enabled info 2016-09-16 12:25:24 +10:00
Jan Bartel b44b9d2540 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-16 11:38:01 +10:00
Jan Bartel 126f767981 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-09-16 11:37:11 +10:00
Jan Bartel a825bab8ca Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-16 11:33:58 +10:00
Greg Wilkins 73edfefa47 Revert "Resolves #788" (#933) 2016-09-16 11:27:57 +10:00
Jan Bartel 5efb6d698a Merge pull request #928 from nevafuse/patch-1
add schema variables
2016-09-16 10:52:01 +10:00
nevafuse 0634882b7c prevent needing analyze privilege when using getIndexInfo
Signed-off-by: nevafuse <nevafuse@gmail.com>
2016-09-15 16:41:33 -04:00
nevafuse 459abd144e add schema variables
Signed-off-by: nevafuse <nevafuse@gmail.com>
2016-09-15 16:41:11 -04:00
Joakim Erdfelt 90b1544a58 Updating to version 9.4.0-SNAPSHOT 2016-09-15 12:27:28 -07:00
Joakim Erdfelt c86f06646a Updating to version 9.4.0.RC0 2016-09-15 11:35:07 -07:00
Joakim Erdfelt 878f0e90a0 Updating jetty-version-maven-plugin version 2016-09-15 11:32:13 -07:00
Joakim Erdfelt 6cf10172ca Updating to version 9.3.13-SNAPSHOT 2016-09-15 07:34:52 -07:00
Joakim Erdfelt 8b35fdc5a5 Updating to version 9.3.12.v20160915 2016-09-15 06:48:16 -07:00
Simone Bordet 9835598727 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-15 12:18:02 +02:00
Simone Bordet 1f4bb58ef4 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-15 12:17:33 +02:00
Simone Bordet 01e29aa45a Fixes #870 - TLS protocol exclusion broken for SslContextFactory(String).
Introduced a private constructor that performs the correct
initialization, and have the other constructors delegate to it.
2016-09-15 12:11:11 +02:00
Simone Bordet 9e01565344 Code cleanups. 2016-09-15 12:11:11 +02:00
Shauway 92025e31fe Two way authentication configuration (#925)
Signed-off-by: Shauway <ha.shauway@gmail.com>
2016-09-15 15:56:36 +10:00
Jan Bartel 5f0b0d1474 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-15 12:25:52 +10:00
Jan Bartel 1f9f45212e Issue #931 2016-09-15 12:25:11 +10:00
Jesse McConnell 2f07a9eee6 test commit 2016-09-14 20:04:52 +00:00
Simone Bordet 585e243ed9 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-14 21:54:20 +02:00
Simone Bordet e3fcb018c4 Fixed merge from branch 'jetty-9.3.x'. 2016-09-14 21:53:35 +02:00
Simone Bordet e746d465db Merged branch 'jetty-9.4.x' into 'master'. 2016-09-14 20:43:05 +02:00
Simone Bordet d2ddf5f5ad Code and Javadocs cleanup. 2016-09-14 20:42:38 +02:00
Simone Bordet 23b0f6b3b8 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-14 18:14:06 +02:00
Simone Bordet 61cd8d5379 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-14 18:13:12 +02:00
Simone Bordet ed14641e87 Made test more robust. 2016-09-14 18:12:34 +02:00
Simone Bordet eb78d5e2c3 Merged branch 'jetty-9.4.x' into 'master'.
Removed deprecated ConnectorStatistics class and its usages.
2016-09-14 17:28:51 +02:00
Simone Bordet 14e000428f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-14 17:26:00 +02:00
Simone Bordet cb89ea8466 Fixes #131 - Improve Connector Statistic names and values.
Removed references to deprecated ConnectorStatistic in favor of
ConnectionStatistics.
2016-09-14 17:24:45 +02:00
Simone Bordet da4819f091 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-14 17:03:05 +02:00
Simone Bordet 186ad447de Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-14 17:02:48 +02:00