Commit Graph

1591 Commits

Author SHA1 Message Date
Joakim Erdfelt cff63f2b6a Merge of `jetty-9.4.x` to `jetty-10.0.x`
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
2019-02-21 09:45:12 -05:00
Joakim Erdfelt 9cdb59d4d7 Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00
Joakim Erdfelt eb70b24016 Updating to version 9.4.15.v20190215 2019-02-15 11:53:00 -05:00
Joakim Erdfelt 2d9f1a22af Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-11-15 07:06:53 -06:00
Joakim Erdfelt 29fd18e046 Updating to version 9.4.15-SNAPSHOT 2018-11-14 16:42:40 -06:00
Joakim Erdfelt c4550056e7 Updating to version 9.4.14.v20181114 2018-11-14 15:19:10 -06:00
Joakim Erdfelt 024d24fe8b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-12 10:05:33 -06:00
Joakim Erdfelt a903017f5f Updating to version 9.4.14-SNAPSHOT 2018-11-11 21:06:50 -06:00
Joakim Erdfelt 49123a3313 Updating to version 9.4.13.v20181111 2018-11-11 20:02:42 -06:00
Simone Bordet 4c1a0f9138 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-10-17 15:56:05 +02:00
Simone Bordet 932f1a7516 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-10-17 15:49:54 +02:00
Simone Bordet 44ac57040a Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-10-17 12:36:56 +02:00
olivier lamy 32912b922d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-06 17:39:57 +10:00
Jesse McConnell c249685953
merge from 9.3.x 2018-09-05 10:27:31 -05:00
Jesse McConnell 863a19bccf
Updating to version 9.3.26-SNAPSHOT 2018-09-04 17:23:31 -05:00
Jesse McConnell 3ce520221d
Updating to version 9.3.25.v20180904 2018-09-04 16:08:21 -05:00
Jesse McConnell 8dd05ac3f7
merge from 9.4.x 2018-09-04 13:48:43 -05:00
Jesse McConnell dcf6a8fa9f
Updating to version 9.4.13-SNAPSHOT 2018-08-30 10:48:22 -05:00
Jesse McConnell 2720868475
Updating to version 9.4.12.v20180830 2018-08-30 08:56:44 -05:00
Greg Wilkins f15bd225b4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-08-21 14:47:19 +10:00
Greg Wilkins babdd5d4b7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-08-16 08:44:07 +10:00
Greg Wilkins 2c0557b1ae VERSION.txt cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-16 08:33:29 +10:00
Greg Wilkins 5ee856c0c1 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-08-12 16:59:33 +10:00
Greg Wilkins b3d1c240e1 fixed VERSION.txt for 9.3.18
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-12 16:59:03 +10:00
Joakim Erdfelt 516d93c488 Updating to version 9.2.27-SNAPSHOT 2018-08-06 11:33:22 -05:00
Joakim Erdfelt 8c637489ae Updating to version 9.2.26.v20180806 2018-08-06 10:51:25 -05:00
Joakim Erdfelt 9390c2df3f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-08-06 09:04:58 -05:00
Joakim Erdfelt 321b4b4f7a Updating VERSION.txt 2018-08-01 12:26:58 -05:00
Simone Bordet 0892ed8983 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-07-18 16:25:39 +02:00
Joakim Erdfelt 0b69f00665 Updating to version 9.4.12-SNAPSHOT 2018-07-11 17:32:16 -05:00
Joakim Erdfelt 260596dd10 Updating to version 9.4.12.RC0 2018-07-11 16:30:55 -05:00
Joakim Erdfelt 0cd4dacbac Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	VERSION.txt
#	aggregates/jetty-all-compact3/pom.xml
#	aggregates/jetty-all/pom.xml
#	apache-jsp/pom.xml
#	apache-jstl/pom.xml
#	examples/async-rest/async-rest-jar/pom.xml
#	examples/async-rest/async-rest-webapp/pom.xml
#	examples/async-rest/pom.xml
#	examples/embedded/pom.xml
#	examples/pom.xml
#	jetty-alpn/jetty-alpn-client/pom.xml
#	jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
#	jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
#	jetty-alpn/jetty-alpn-java-client/pom.xml
#	jetty-alpn/jetty-alpn-java-server/pom.xml
#	jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
#	jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
#	jetty-alpn/jetty-alpn-server/pom.xml
#	jetty-alpn/pom.xml
#	jetty-annotations/pom.xml
#	jetty-ant/pom.xml
#	jetty-bom/pom.xml
#	jetty-cdi/cdi-2/pom.xml
#	jetty-cdi/cdi-core/pom.xml
#	jetty-cdi/cdi-full-servlet/pom.xml
#	jetty-cdi/cdi-servlet/pom.xml
#	jetty-cdi/cdi-websocket/pom.xml
#	jetty-cdi/pom.xml
#	jetty-cdi/test-cdi-webapp/pom.xml
#	jetty-client/pom.xml
#	jetty-continuation/pom.xml
#	jetty-deploy/pom.xml
#	jetty-distribution/pom.xml
#	jetty-documentation/pom.xml
#	jetty-fcgi/fcgi-client/pom.xml
#	jetty-fcgi/fcgi-server/pom.xml
#	jetty-fcgi/pom.xml
#	jetty-gcloud/jetty-gcloud-session-manager/pom.xml
#	jetty-gcloud/pom.xml
#	jetty-hazelcast/pom.xml
#	jetty-home/pom.xml
#	jetty-http-spi/pom.xml
#	jetty-http/pom.xml
#	jetty-http2/http2-alpn-tests/pom.xml
#	jetty-http2/http2-client/pom.xml
#	jetty-http2/http2-common/pom.xml
#	jetty-http2/http2-hpack/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-http2/http2-server/pom.xml
#	jetty-http2/pom.xml
#	jetty-infinispan/pom.xml
#	jetty-io/pom.xml
#	jetty-jaas/pom.xml
#	jetty-jaspi/pom.xml
#	jetty-jmx/pom.xml
#	jetty-jndi/pom.xml
#	jetty-jspc-maven-plugin/pom.xml
#	jetty-maven-plugin/pom.xml
#	jetty-memcached/jetty-memcached-sessions/pom.xml
#	jetty-memcached/pom.xml
#	jetty-nosql/pom.xml
#	jetty-osgi/jetty-osgi-alpn/pom.xml
#	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
#	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
#	jetty-osgi/jetty-osgi-boot/pom.xml
#	jetty-osgi/jetty-osgi-httpservice/pom.xml
#	jetty-osgi/pom.xml
#	jetty-osgi/test-jetty-osgi-context/pom.xml
#	jetty-osgi/test-jetty-osgi-fragment/pom.xml
#	jetty-osgi/test-jetty-osgi-server/pom.xml
#	jetty-osgi/test-jetty-osgi-webapp/pom.xml
#	jetty-osgi/test-jetty-osgi/pom.xml
#	jetty-plus/pom.xml
#	jetty-proxy/pom.xml
#	jetty-quickstart/pom.xml
#	jetty-rewrite/pom.xml
#	jetty-runner/pom.xml
#	jetty-security/pom.xml
#	jetty-server/pom.xml
#	jetty-server/src/main/config/etc/jetty-http.xml
#	jetty-server/src/main/config/etc/jetty-ssl.xml
#	jetty-servlet/pom.xml
#	jetty-servlets/pom.xml
#	jetty-spring/pom.xml
#	jetty-start/pom.xml
#	jetty-unixsocket/pom.xml
#	jetty-util-ajax/pom.xml
#	jetty-util/pom.xml
#	jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/MultiExceptionTest.java
#	jetty-webapp/pom.xml
#	jetty-websocket/javax-websocket-client-impl/pom.xml
#	jetty-websocket/javax-websocket-server-impl/pom.xml
#	jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java
#	jetty-websocket/pom.xml
#	jetty-websocket/websocket-api/pom.xml
#	jetty-websocket/websocket-client/pom.xml
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientCloseTest.java
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
#	jetty-websocket/websocket-common/pom.xml
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java
#	jetty-websocket/websocket-server/pom.xml
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilterTest.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java
#	jetty-websocket/websocket-servlet/pom.xml
#	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/FragmentExtensionTest.java
#	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/sockets/pong/PongContextListener.java
#	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/ConfiguratorTest.java
#	jetty-xml/pom.xml
#	pom.xml
#	tests/pom.xml
#	tests/test-continuation/pom.xml
#	tests/test-http-client-transport/pom.xml
#	tests/test-integration/pom.xml
#	tests/test-jmx/jmx-webapp-it/pom.xml
#	tests/test-jmx/jmx-webapp/pom.xml
#	tests/test-jmx/pom.xml
#	tests/test-loginservice/pom.xml
#	tests/test-quickstart/pom.xml
#	tests/test-sessions/pom.xml
#	tests/test-sessions/test-file-sessions/pom.xml
#	tests/test-sessions/test-gcloud-sessions/pom.xml
#	tests/test-sessions/test-hazelcast-sessions/pom.xml
#	tests/test-sessions/test-infinispan-sessions/pom.xml
#	tests/test-sessions/test-jdbc-sessions/pom.xml
#	tests/test-sessions/test-memcached-sessions/pom.xml
#	tests/test-sessions/test-mongodb-sessions/pom.xml
#	tests/test-sessions/test-sessions-common/pom.xml
#	tests/test-webapps/pom.xml
#	tests/test-webapps/test-http2-webapp/pom.xml
#	tests/test-webapps/test-jaas-webapp/pom.xml
#	tests/test-webapps/test-jetty-webapp/pom.xml
#	tests/test-webapps/test-jndi-webapp/pom.xml
#	tests/test-webapps/test-mock-resources/pom.xml
#	tests/test-webapps/test-proxy-webapp/pom.xml
#	tests/test-webapps/test-servlet-spec/pom.xml
#	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
#	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
#	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
#	tests/test-webapps/test-webapp-rfc2616/pom.xml
2018-06-12 11:11:38 -05:00
Joakim Erdfelt 3932b11e64 Merge remote-tracking branch 'origin/release-9.4.11' into jetty-9.4.x 2018-06-07 14:31:24 -05:00
Joakim Erdfelt bf5697cc14 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-06-07 14:31:10 -05:00
Joakim Erdfelt 0e6c91b604 Updating to version 9.2.26-SNAPSHOT 2018-06-06 18:54:58 -05:00
Joakim Erdfelt 4830fd15e9 Updating to version 9.2.25.v20180606 2018-06-06 16:42:54 -05:00
Joakim Erdfelt e4bfe00dce Updating to version 9.4.12-SNAPSHOT 2018-06-05 14:18:37 -05:00
Joakim Erdfelt d5fc0523cf Updating to version 9.4.11.v20180605 2018-06-05 13:23:02 -05:00
Joakim Erdfelt 5eefa90e05 Updating to version 9.3.25-SNAPSHOT 2018-06-05 13:13:07 -05:00
Joakim Erdfelt 84205aa28f Updating to version 9.3.24.v20180605 2018-06-05 12:11:03 -05:00
Joakim Erdfelt e89180698c Improving VERSION.txt 2018-06-05 12:08:46 -05:00
Joakim Erdfelt 734af26ccb Updating to version 9.3.25-SNAPSHOT 2018-05-21 13:46:46 -05:00
Joakim Erdfelt e2a533fd3d Updating to version 9.3.24.v20180521 2018-05-21 12:52:08 -05:00
Joakim Erdfelt 1732ffca51 Updating to version 9.4.11-SNAPSHOT 2018-05-03 11:48:05 -05:00
Joakim Erdfelt daa59876e6 Updating to version 9.4.10.v20180503 2018-05-03 10:55:19 -05:00
Joakim Erdfelt f56fb440a5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-03-26 11:50:47 -05:00
Joakim Erdfelt e2cd16f8aa Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-03-26 11:38:04 -05:00
Joakim Erdfelt 1c04f9838d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed 2018-03-22 16:42:42 -05:00
Joakim Erdfelt c3cc138a3b Updating to version 9.4.10-SNAPSHOT 2018-03-20 08:25:59 -05:00
Joakim Erdfelt 1f8159b1e4 Updating to version 9.4.9.v20180320 2018-03-20 07:18:24 -05:00
Joakim Erdfelt e3e3f9eb0b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed 2018-03-06 11:16:25 -06:00
Joakim Erdfelt a05b157c03 Updating to version 9.3.24-SNAPSHOT 2018-02-28 16:39:30 -06:00
Joakim Erdfelt 0554f8d8b4 Updating to version 9.3.23.v20180228 2018-02-28 15:45:57 -06:00
Joakim Erdfelt d7ea895aeb Fixing VERSION.txt order 2018-02-28 15:43:53 -06:00
Joakim Erdfelt 06e1252a6f Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-02-08 09:22:35 -06:00
Joakim Erdfelt 12c0a55de0 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2018-02-07 15:55:19 -06:00
Greg Wilkins b2ff7c5cb8 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-01-08 21:30:12 +01:00
Joakim Erdfelt bd01e1877a Updating to version 9.2.25-SNAPSHOT 2018-01-05 11:35:42 -06:00
Joakim Erdfelt a617842695 Updating to version 9.2.24.v20180105 2018-01-05 10:11:08 -06:00
Simone Bordet a1a3cb7c80 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-01-05 11:12:25 +01:00
Simone Bordet 887b57649b Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-01-05 11:11:11 +01:00
Joakim Erdfelt 2dd970b055 Updating to version 9.2.24-SNAPSHOT 2017-12-18 10:43:47 -06:00
Joakim Erdfelt cdbe733684 Updating to version 9.2.23.v20171218 2017-12-18 09:06:48 -06:00
Joakim Erdfelt 6b339bde7f Merge branch 'jetty-9.4.x' 2017-11-29 10:56:39 -07:00
Joakim Erdfelt ff53002fac Updating to version 9.4.9-SNAPSHOT 2017-11-21 13:11:31 -07:00
Joakim Erdfelt 82b8fb23f7 Updating to version 9.4.8.v20171121 2017-11-21 12:33:52 -07:00
Jesse McConnell bafe63dc52 add in 9.3.22 release notes 2017-11-03 12:03:26 -05:00
Jesse McConnell a3deeb2945 add in jetty-9.3.22 release notes 2017-11-03 09:51:20 -05:00
Jesse McConnell a72eb0001d Updating to version 9.3.23-SNAPSHOT 2017-10-30 15:39:57 -05:00
Jesse McConnell 5fe04f8799 set for release 2017-10-30 15:05:46 -05:00
Greg Wilkins 1b7ebf5599 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-09-23 00:22:57 +10:00
Joakim Erdfelt 5fc0167003 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-09-20 14:46:13 -07:00
Joakim Erdfelt 17e11a7e7d Updating to version 9.3.22-SNAPSHOT 2017-09-18 15:04:47 -07:00
Joakim Erdfelt 15bd75f858 Updating to version 9.3.21.v20170918 2017-09-18 14:24:36 -07:00
Joakim Erdfelt e838eced95 Removing M0 release details 2017-09-18 14:20:19 -07:00
Joakim Erdfelt d9865a02ba Updating to version 9.4.8-SNAPSHOT 2017-09-14 08:44:27 -07:00
Joakim Erdfelt 80fb788d0c Updating to version 9.4.7.v20170914 2017-09-14 07:35:18 -07:00
Simone Bordet d8861c795c Merged branch 'jetty-9.4.x' into 'master'. 2017-08-15 18:54:11 +02:00
Joakim Erdfelt fb3bf9a212 Moving 9.2.x status down 1 to aid in version diffs 2017-08-15 07:14:18 -07:00
Joakim Erdfelt 1311052b15 Cleaning up state of branch to match the original jetty-9.4.x
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
Joakim Erdfelt 585f126b48 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x-clean 2017-08-08 09:24:41 -07:00
Joakim Erdfelt a1f614fd0e Removing Test/Testing related commits from VERSION.txt 2017-08-08 09:14:51 -07:00
Joakim Erdfelt 3fdbcffbbd Updating to version 9.2.23-SNAPSHOT 2017-08-08 09:12:55 -07:00
Joakim Erdfelt 8a674adddc Updating to version 9.2.22.v20170606 2017-08-08 09:12:46 -07:00
Joakim Erdfelt 11a544d6ac Updating to version 9.3.22-SNAPSHOT 2017-08-01 11:26:37 -07:00
Joakim Erdfelt bb1d69ca52 Updating to version 9.3.21.M0 2017-08-01 10:47:04 -07:00
Simone Bordet 552b7c3e0e Merged branch 'jetty-9.4.x' into 'master'. 2017-07-24 11:19:04 +02:00
Simone Bordet 4b0003f086 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-07-24 11:13:32 +02:00
Simone Bordet a0026fd9d2 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-07-24 10:44:39 +02:00
Greg Wilkins b358c06974 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-18 12:46:44 +02:00
Joakim Erdfelt 068a1f9e40 Removing Test/Testing related commits from VERSION.txt 2017-07-17 14:17:40 -07:00
Joakim Erdfelt 76ace004b6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-09 09:17:43 -07:00
Joakim Erdfelt 4d2c299fe8 Updating to version 9.2.23-SNAPSHOT 2017-06-06 08:55:12 -07:00
Joakim Erdfelt 0af30bce5a Updating to version 9.2.22.v20170606 2017-06-06 07:03:05 -07:00
Joakim Erdfelt 6a3c40e935 Updating to version 9.4.7-SNAPSHOT 2017-05-31 17:26:34 -07:00
Joakim Erdfelt 8ba0f2d95d Updating to version 9.4.6.v20170531 2017-05-31 16:22:52 -07:00
Joakim Erdfelt 429380d36a Updating to version 9.3.21-SNAPSHOT 2017-05-31 16:10:04 -07:00
Joakim Erdfelt 0f3b1cbe36 Updating to version 9.3.20.v20170531 2017-05-31 15:24:57 -07:00
Joakim Erdfelt cf56168f7d Updating to version 9.3.20-SNAPSHOT 2017-05-02 15:26:56 -07:00
Joakim Erdfelt d36d57d5c7 Updating to version 9.3.19.v20170502 2017-05-02 14:31:51 -07:00
Joakim Erdfelt 782f36f157 Updating to version 9.4.6-SNAPSHOT 2017-05-02 14:29:09 -07:00
Joakim Erdfelt 9d8ad7489c Updating to version 9.4.5.v20170502 2017-05-02 13:22:18 -07:00
Greg Wilkins 68caf72835 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-01 13:30:41 +02:00
Joakim Erdfelt 92ea5bda21 Updating to version 9.4.5-SNAPSHOT 2017-04-14 14:43:36 -07:00
Joakim Erdfelt 3dc8f557c6 Updating to version 9.4.4.v20170414 2017-04-14 13:20:17 -07:00
Joakim Erdfelt feeaa4b0a0 Removing erroneous 9.3.19-SNAPSHOT reference from VERSION.txt 2017-04-13 06:32:36 -07:00
Jan Bartel 8885f24ccb Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-04-12 11:26:09 +10:00
Joakim Erdfelt 9e2aeda052 Updating to version 9.3.19-SNAPSHOT 2017-04-06 07:47:53 -07:00
Joakim Erdfelt 63273aa40b Updating to version 9.3.18.v20170406 2017-04-06 06:31:02 -07:00
Greg Wilkins dd084b4e74 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-30 17:20:22 +11:00
Joakim Erdfelt b8ddef08d6 Merge remote-tracking branch 'origin/release-9.4.3' into jetty-9.4.x 2017-03-22 09:31:44 -07:00
Joakim Erdfelt 78450cb843 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-22 09:23:25 -07:00
Joakim Erdfelt 1360b863dc Updating to version 9.4.4-SNAPSHOT 2017-03-17 10:53:54 -07:00
Joakim Erdfelt 95e94b49d8 Updating to version 9.4.3.v20170317 2017-03-17 09:54:58 -07:00
Joakim Erdfelt a6a0ab991f Updating to version 9.3.18-SNAPSHOT 2017-03-17 09:48:19 -07:00
Joakim Erdfelt 307d23975e Updating to version 9.3.17.v20170317 2017-03-17 09:07:39 -07:00
Greg Wilkins 05f05520eb Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-07 07:55:36 +11:00
Joakim Erdfelt 523fab30bd Updating to version 9.4.3-SNAPSHOT 2017-02-20 08:13:31 -07:00
Joakim Erdfelt 4a674b9cc9 Updating to version 9.4.2.v20170220 2017-02-20 06:22:45 -07:00
Jesse McConnell 35707ae84a merge jetty-9.4.x into master 2017-01-26 11:26:56 -06:00
Jesse McConnell bba4a8bbf6 Merge remote-tracking branch 'origin/release-9.4.1' into jetty-9.4.x 2017-01-26 11:22:08 -06:00
Jesse McConnell 76e0bb1e81 merge jetty-9.3.x to jetty-9.4.x 2017-01-26 11:21:33 -06:00
Jesse McConnell 635355c6e7 Merge remote-tracking branch 'origin/release-9.3.16' into jetty-9.3.x 2017-01-26 11:07:27 -06:00
Jesse McConnell b844747d41 merge jetty-9.2.x into jetty-9.3.x 2017-01-26 11:07:01 -06:00
Jesse McConnell e695fc80d6 Updating to version 9.2.22-SNAPSHOT 2017-01-20 12:32:51 -06:00
Jesse McConnell 408a94873f set for release 2017-01-20 12:30:27 -06:00
Jesse McConnell d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell 1ba41c336d set for release 2017-01-20 09:46:59 -06:00
Jesse McConnell 66b43ecda8 Updating to version 9.3.17-SNAPSHOT 2017-01-20 09:33:43 -06:00
Jesse McConnell b4260da2d6 set for release 2017-01-20 09:04:10 -06:00
Joakim Erdfelt 7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt 680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
Joakim Erdfelt 6b3b59df43 Updating to version 9.2.21-SNAPSHOT 2016-12-16 16:23:06 -07:00
Joakim Erdfelt bcbcee7f23 Updating to version 9.2.20.v20161216 2016-12-16 15:47:41 -07:00
Simone Bordet b6c4e5b7c9 Merged branch 'jetty-9.4.x' into 'master'. 2016-12-14 11:53:48 +01:00
Jesse McConnell 6a7e5dd4f5 Updating to version 9.4.1-SNAPSHOT 2016-12-08 09:41:50 -06:00
Jesse McConnell 026c1656b9 set for release 2016-12-08 08:54:56 -06:00
Jan Bartel c02dec5654 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-08 11:31:00 +11:00
Jesse McConnell f8338b3f59 Updating to version 9.4.1-SNAPSHOT 2016-12-07 10:32:41 -06:00
Jesse McConnell ae773704ec set for release 2016-12-07 09:45:15 -06:00
Jesse McConnell eafea8592e Updating to version 9.4.0-SNAPSHOT 2016-12-05 09:39:45 -06:00
Jesse McConnell c26170a3c1 set for release 2016-12-05 08:45:44 -06:00
Greg Wilkins 4046ef26d3 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-02 13:35:16 +11:00
Jesse McConnell d4190e28a6 update VERSION.txt 2016-12-01 15:36:31 -06:00
Joakim Erdfelt 37b1f17b26 Updating to version 9.4.0-SNAPSHOT 2016-11-16 10:27:36 -07:00
Joakim Erdfelt 4aaa576b2f Updating to version 9.4.0.RC2 2016-11-16 08:55:51 -07:00
Joakim Erdfelt be3c821c9e Merge branch 'jetty-9.4.x' 2016-11-15 14:34:02 -07:00
Joakim Erdfelt 859b46f1e8 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-15 14:33:32 -07:00
Joakim Erdfelt 2b47ee1453 Fixing duplicated entries in older versions 2016-11-15 14:32:23 -07:00
Joakim Erdfelt fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -07:00
Joakim Erdfelt 6d95fef35d Merge branch 'release-9.4.0.RC1' into jetty-9.4.x 2016-11-15 14:25:18 -07:00
Jesse McConnell 8b545203d4 merge from 9.3.x release 2016-11-07 11:29:39 -06:00
Joakim Erdfelt 2c38511828 Updating to version 9.3.15-SNAPSHOT 2016-10-28 13:01:34 -07:00
Joakim Erdfelt 14611d2f76 Updating to version 9.3.14.v20161028 2016-10-28 12:21:02 -07:00
Joakim Erdfelt 48791aceb2 Updating to version 9.4.0-SNAPSHOT 2016-10-21 13:57:01 -07:00
Joakim Erdfelt 5c2821fdee Updating to version 9.4.0.RC1 2016-10-21 12:48:53 -07:00
Joakim Erdfelt ac78631e4c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-10-20 09:57:49 -07:00
Joakim Erdfelt ade14ba34b Updating to version 9.3.14-SNAPSHOT 2016-10-14 11:33:51 -07:00
Joakim Erdfelt c3a78e70a8 Updating to version 9.3.13.v20161014 2016-10-14 10:39:37 -07:00
Jesse McConnell 3d69ce327e Merge branch 'jetty-9.4.x' 2016-09-30 19:07:23 +00:00
Jesse McConnell 3a34e4d21b Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-30 19:06:51 +00:00
Jesse McConnell 863913b64e set for dev 2016-09-30 19:05:47 +00:00
Jesse McConnell 2d516487ab set for release 2016-09-30 16:44:52 +00:00
Greg Wilkins 94a9cfc09d Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-21 14:02:09 +10:00
Greg Wilkins b164298b99 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-21 14:01:27 +10:00
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
WalkerWatch bf03f86e9e Removing documentation issues from Version.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-20 17:50:34 -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 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
Jesse McConnell 2f07a9eee6 test commit 2016-09-14 20:04:52 +00:00
Joakim Erdfelt 7ec3dbeecc Merge branch 'jetty-9.4.x' 2016-09-09 11:23:29 -07:00
Joakim Erdfelt d531e8f07e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-09 11:23:10 -07:00
Joakim Erdfelt 83f868e473 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-09-09 11:22:47 -07:00
Joakim Erdfelt fb7da26ad2 Updating to version 9.2.20-SNAPSHOT 2016-09-08 13:04:11 -07:00
Joakim Erdfelt 7b94bc32f4 Updating to version 9.2.19.v20160908 2016-09-08 12:11:44 -07:00
Jesse McConnell 7aa63e0313 set for dev 2016-08-16 08:19:10 -05:00
Jesse McConnell 9b6af31dce merge from 9.4.x after M1 release 2016-08-16 08:18:27 -05:00
Jesse McConnell be1e9ed9d8 set for release 2016-08-15 09:41:21 -05:00
Greg Wilkins 94eeb726b2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-04 13:31:03 +10:00
Greg Wilkins 42b85308a7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-04 11:03:33 +10:00
Greg Wilkins 12804a16f5 Fixed git issue references 2016-08-04 11:02:39 +10:00
Joakim Erdfelt 06fd770e27 Merge branch 'jetty-9.4.x' 2016-07-28 12:44:09 -07:00
Joakim Erdfelt 854c8a82bc Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-28 12:43:52 -07:00
Joakim Erdfelt a4601143ee Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-07-28 12:40:18 -07:00
Joakim Erdfelt 6e1b1cdb36 Updating to version 9.3.12-SNAPSHOT 2016-07-21 19:07:19 -07:00
Joakim Erdfelt 9fd6d4354e Updating to version 9.3.11.v20160721 2016-07-21 18:37:09 -07:00
Joakim Erdfelt 0b18340179 Updating to version 9.2.19-SNAPSHOT 2016-07-21 13:10:23 -07:00
Joakim Erdfelt d3ff3423f0 Updating to version 9.2.18.v20160721 2016-07-21 12:35:26 -07:00
Jesse McConnell 2dd4843e44 merge from 9.4.x 2016-06-22 15:28:17 -05:00
Jesse McConnell 399c5beb04 merge from 9.3.x 2016-06-22 15:23:51 -05:00
Jesse McConnell 94fdff47a0 set for release 2016-06-22 13:27:41 -05:00
Jesse McConnell c82b0b4c1a set for release 2016-06-22 09:30:58 -05:00
Jesse McConnell 5e64528403 set for release 2016-06-21 08:18:30 -05:00
Jesse McConnell ac815876db set for release 2016-06-21 08:17:51 -05:00
Jesse McConnell d9ceeb4ecd updating for version 2016-06-20 16:47:46 -05:00
Joakim Erdfelt 49c28e958e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-20 09:56:39 -07:00
Joakim Erdfelt 62effb73d3 Removing duplicate entries in VERSION.txt 2016-06-20 09:56:21 -07:00