Merged branch 'master' into 'jetty-http2'.

1 files changed, 32 insertions, 1 deletions

diff --git a/VERSION.txt b/VERSION.txt
index 8aa5803c53..610cc5c783 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,6 +1,37 @@
 jetty-10.0.0-SNAPSHOT
 
-jetty-9.2.0-SNAPSHOT
+jetty-9.2.2-SNAPSHOT
+
+jetty-9.2.1.v20140609 - 09 June 2014
+ + 347110 Supprt ClassFileTransormers in WebAppClassLoader
+ + 432192 jetty-start / Allow JETTY_LOGS use for start-log-file
+ + 432321 jetty-start / Allow defining extra start directories for common
+   configurations
+ + 435322 Improved debug
+ + 436029 GzipFilter errors on asynchronous methods with message to
+   AsyncGzipFilter
+ + 436345 Refactor AbstractSession to minimize burden on subclasses to
+   implement behaviour
+ + 436388 Allow case-insensitive STOP.KEY and STOP.PORT use
+ + 436405 ${jetty.base}/resources not on classpath with default configuration
+ + 436520 Start / Allow https and file urls in jetty-start's module download
+   mechanism
+ + 436524 Start / Downloadable [files] references in modules cannot use ":"
+   themselves
+
+jetty-9.2.0.v20140526 - 26 May 2014
+ + 429390 Decoders and Encoders are not registered for non-annotated
+   ClientEndpoint
+ + 434810 better handling of bad messages
+ + 435086 ${jetty.base}/resources not on classpath when using
+   --module=resources
+ + 435088 lib/npn packaging of jetty-distribution is off
+ + 435206 Can't add Cookie header on websocket ClientUpgradeRequest
+ + 435217 Remove deprecated TagLibConfiguration
+ + 435223 High cpu usage in
+   FCGIHttpParser.parseContent(ResponseContentParser.java:314).
+ + 435338 Incorrect handling of asynchronous content.
+ + 435412 Make AbstractSession.access() more amenable to customization
 
 jetty-9.2.0.RC0 - 15 May 2014
  + 419972 Support sending forms (application/x-www-form-urlencoded).