Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,592 Commits 68 Branches 465 Tags 359 MiB
Commit Graph

13592 Commits

Author SHA1 Message Date
Simone Bordet 308bfd9b91 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-30 18:11:05 +02:00
Simone Bordet 285f283e5b Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-30 18:09:58 +02:00
Simone Bordet 38d48395b0 Issue #918 - Support certificates hot reload. 
Introduced SslContextFactory.reload(Consumer) to perform atomic
reload of SslContextFactory.
 2016-09-30 17:48:09 +02:00
Simone Bordet 7471f5c8f2 Code cleanup. 2016-09-30 17:47:52 +02:00
Jesse McConnell 3234e243a4 Merge branch 'jetty-9.4.x' 2016-09-29 11:23:56 -05:00
Jesse McConnell 5a0b0d96f9 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-29 11:23:34 -05:00
Jesse McConnell 7a3a1006cf Merge pull request #971 from WalkerWatch/issues/896 
Update quickstart docs for #896
 2016-09-29 11:22:08 -05:00
Jesse McConnell 459506d89b Merge pull request #970 from WalkerWatch/issues/943 
Resolves #943
 2016-09-29 11:21:58 -05:00
Jesse McConnell e95d14a11e Merge branch 'jetty-9.4.x' 2016-09-29 11:21:42 -05:00
Jesse McConnell 896438eb45 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-29 11:21:16 -05:00
WalkerWatch c1c42f6b73 Updates quickstart docs for #896 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-09-29 11:57:53 -04:00
WalkerWatch db4cce8161 Resolves #943 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-09-29 10:13:35 -04:00
Jesse McConnell aaa2faa54a Merge pull request #969 from WalkerWatch/issues/965 
Resolves #965
 2016-09-29 08:50:26 -05:00
WalkerWatch 260cb3ce41 Resolves #965 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-09-29 09:44:47 -04:00
Jan Bartel 0132c98748 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-29 07:10:58 +10:00
Jan Bartel 6029d25c78 Issue #954 
Fix javadoc
 2016-09-29 07:10:19 +10:00
Simone Bordet 8dc18fe088 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-28 11:56:24 +02:00
Simone Bordet 7e376fd9da Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-28 11:53:54 +02:00
Simone Bordet 0f97c3df5d Fixes #966 - Remove usages of ConcurrentArrayQueue. 2016-09-28 11:40:39 +02:00
Simone Bordet efe339e246 Code cleanup. 2016-09-28 11:40:39 +02:00
Jan Bartel bfcac6a5ec Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-28 18:32:49 +10:00
Jan Bartel 6c1f0a6b4a Issue #954 2016-09-28 18:30:33 +10:00
Jan Bartel 2383fb1c4a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-28 14:55:43 +10:00
Jan Bartel b386551d3a Issue #953 2016-09-28 14:54:29 +10:00
Joakim Erdfelt 76422ba76c Merge branch 'jetty-9.4.x' 2016-09-27 14:23:59 -07:00
Joakim Erdfelt 300a7ca220 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-27 14:23:44 -07:00
Joakim Erdfelt e82592fe9c Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-09-27 14:23:30 -07:00
Joakim Erdfelt fc447fe2a3 Minor typo fix 2016-09-27 14:23:24 -07:00
Jesse McConnell 2614105e1b Merge branch 'jetty-9.4.x' 2016-09-27 09:35:25 -05:00
Jesse McConnell 60bab5a3b9 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-27 09:35:00 -05:00
WalkerWatch 16b98efd7e Resolves #930 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-09-27 09:34:12 -05:00
Jesse McConnell 3ffd4110e1 Merge pull request #957 from WalkerWatch/issues/930 
Resolves #930
 2016-09-27 09:31:57 -05:00
Simone Bordet 6e653c9057 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-26 23:19:10 +02:00
Simone Bordet 03d9ad07c9 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-26 23:18:31 +02:00
Simone Bordet 6c4d6baa2e Returning longs for getMessagesIn() and getMessagesOut(). 2016-09-26 23:18:07 +02:00
Simone Bordet cba4169ba9 Made test more robust. 2016-09-26 23:17:29 +02:00
Joakim Erdfelt 347223e374 Merge branch 'jetty-9.4.x' 2016-09-26 09:48:54 -07:00
Joakim Erdfelt 41adb4d63b Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-26 09:48:34 -07:00
Joakim Erdfelt a45e8b5154 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-09-26 09:47:51 -07:00
Joakim Erdfelt 885bee09a5 Adjusting Jenkins timeouts 2016-09-26 09:47:29 -07:00
Simone Bordet f53e288f8b Merged branch 'jetty-9.4.x' into 'master'. 2016-09-26 15:52:30 +02:00
Simone Bordet a292ef0652 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-26 15:52:18 +02:00
Simone Bordet 4fcf22a2c5 Fixes test after the changes for #960. 2016-09-26 15:51:25 +02:00
Simone Bordet e01686e44d Merged branch 'jetty-9.4.x' into 'master'. 2016-09-26 15:05:02 +02:00
Simone Bordet 04604166bc Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-26 15:04:47 +02:00
Simone Bordet 94137583f8 Added assumption to make test more robust. 2016-09-26 15:04:21 +02:00
Simone Bordet c8fecc993f Merged branch 'jetty-9.4.x' into 'master'. 2016-09-26 12:25:47 +02:00
Simone Bordet e9e276c641 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-26 12:25:29 +02:00
Simone Bordet a8b25819eb Code cleanups. 2016-09-26 12:25:03 +02:00
Simone Bordet 79889f05f5 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-26 12:21:05 +02:00