Commit Graph

1241 Commits

Author SHA1 Message Date
Jesse McConnell 906fa45629 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-26 09:50:18 -05:00
Jesse McConnell 012a5864be set for dev 2016-05-26 09:49:51 -05:00
Jesse McConnell fb7477c5d2 set for release 2016-05-26 08:09:28 -05:00
Greg Wilkins de8b826d1f Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-20 12:54:02 +10:00
Greg Wilkins e15e3d12ee Fixed bad VERSION.txt generation from release 2016-05-20 12:40:50 +10:00
Jesse McConnell 80cadf2c01 merging in from 9.3.x release 2016-05-19 10:05:44 -05:00
Jesse McConnell ed61d796ae set version for dev 2016-05-19 09:51:23 -05:00
Jesse McConnell ceac6be05b resolve merge from 9.2.x release 2016-05-19 09:30:32 -05:00
Jesse McConnell 3deebad503 set for dev 2016-05-19 08:56:13 -05:00
Jesse McConnell 0cb40665c2 set for release 2016-05-17 16:46:46 -05:00
Jesse McConnell e31f1401dc set for release 2016-05-17 11:28:03 -05:00
Joakim Erdfelt 301fc12d98 Merge branch 'jetty-9.3.x' 2016-04-25 12:11:38 -07:00
Joakim Erdfelt 8cc041bb04 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-04-25 12:00:45 -07:00
Joakim Erdfelt 939505c342 Updating to version 9.2.17-SNAPSHOT 2016-04-14 14:03:21 -07:00
Joakim Erdfelt 778fac638d Updating to version 9.2.16.v20160414 2016-04-14 13:21:34 -07:00
Joakim Erdfelt 47bbd9364d Revert "Updating to version 9.2.16.v20160414"
This reverts commit 29ae63855b.
2016-04-14 13:19:59 -07:00
Joakim Erdfelt 29ae63855b Updating to version 9.2.16.v20160414 2016-04-14 13:17:21 -07:00
Joakim Erdfelt 2c4cdbe259 Merge branch 'jetty-9.3.x' 2016-04-13 11:52:53 -07:00
Joakim Erdfelt 6fb338e50d Updating to version 9.3.9-SNAPSHOT 2016-04-11 16:20:50 -07:00
Joakim Erdfelt bb4f3c4882 Updating to version 9.3.9.M1 2016-04-11 15:35:22 -07:00
Joakim Erdfelt 3624339ec6 Merge branch 'jetty-9.3.x' 2016-03-16 10:29:29 -07:00
Joakim Erdfelt ca5bedb97f Improving VERSION.txt language 2016-03-16 10:20:41 -07:00
Joakim Erdfelt c68d3b1d8d Updating to version 9.3.9-SNAPSHOT 2016-03-14 09:07:52 -07:00
Joakim Erdfelt 1f3b3f31f4 Updating to version 9.3.8.v20160314 2016-03-14 08:30:20 -07:00
Simone Bordet 21abfb0351 Merged branch 'jetty-9.3.x' into 'master'. 2016-03-01 15:35:49 +01:00
Joakim Erdfelt bf4a634d0b Merge branch 'release-9.3.8' into jetty-9.3.x 2016-02-29 11:45:29 -07:00
Joakim Erdfelt cfc2dc2b01 Merge branch 'jetty-9.3.x' 2016-02-26 08:22:39 -07:00
Joakim Erdfelt aed05a1e36 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-02-26 08:22:12 -07:00
Joakim Erdfelt 9111aeb690 Updating to version 9.3.8-SNAPSHOT 2016-02-25 11:06:14 -07:00
Joakim Erdfelt bee564c7d9 Updating to version 9.3.8.RC0 2016-02-25 10:28:00 -07:00
Joakim Erdfelt f98dde5e5b Updating to version 9.2.16-SNAPSHOT 2016-02-10 15:36:41 -07:00
Joakim Erdfelt 9b6890d3c1 Updating to version 9.2.15.v20160210 2016-02-10 14:49:12 -07:00
Simone Bordet 56c0bc768c Merged branch 'jetty9.3.x' into 'master'. 2016-01-21 17:52:37 +01:00
Joakim Erdfelt e0ce545ad7 Updating to version 9.3.8-SNAPSHOT 2016-01-15 17:15:14 -07:00
Joakim Erdfelt c0b191119b Updating to version 9.3.7.v20160115 2016-01-15 16:40:15 -07:00
Joakim Erdfelt c51a35203c Merge branch 'jetty-9.3.x' 2016-01-14 10:00:53 -07:00
Greg Wilkins c5cbc64e77 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-01-14 11:00:06 +11:00
Joakim Erdfelt b7f9c9aca9 Updating to version 9.3.7-SNAPSHOT 2016-01-13 08:21:01 -07:00
Joakim Erdfelt 21ca3f6690 Updating to version 9.3.7.RC1 2016-01-13 07:30:24 -07:00
Joakim Erdfelt f257765f33 Updating to version 9.3.7-SNAPSHOT 2016-01-05 11:51:04 -07:00
Joakim Erdfelt e81912f98c Updating to version 9.3.7.RC0 2016-01-05 11:17:28 -07:00
Simone Bordet 9aa6dc1e7d Merged branch 'jetty-9.3.x' into 'master'. 2015-12-08 13:02:55 +01:00
Simone Bordet 9c673e542d Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-12-08 13:02:20 +01:00
Simone Bordet 65d33f8b49 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-18 21:40:51 +01:00
Joakim Erdfelt edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt d737e1c638 Updating to version 9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt ecba378f5c Updating to version 9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Simone Bordet 964afc3020 Merged branch 'jetty-9.3.x' into 'master'. 2015-10-19 12:35:26 +02:00
Joakim Erdfelt dde32787c4 Updating to version 9.3.6-SNAPSHOT 2015-10-12 15:47:37 -07:00