Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,887 Commits 73 Branches 465 Tags 362 MiB
Commit Graph

101 Commits

Author SHA1 Message Date
Joakim Erdfelt ba761071f3 Merge branch 'jetty-9.4.x' 2016-07-12 17:50:37 -07:00
Joakim Erdfelt 232a077b9d Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-12 17:50:16 -07:00
Joakim Erdfelt 27195a3b04 Merge pull request #712 from WalkerWatch/jetty-9.3.x 
Chapter 8 and 9 cleanup.
 2016-07-12 16:32:35 -07:00
WalkerWatch 00551d73b2 Chapter 9 clean up and fixes Part I 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-12 19:12:15 -04:00
Simone Bordet c77562bc95 Issue #684 - HttpClient proxies (HttpProxy and Socks4Proxy) do not support authentication. 
The feature was already present, improved documentation.
 2016-07-12 23:22:43 +02:00
Joakim Erdfelt c3bcce1ce4 Merge branch 'jetty-9.4.x' 2016-07-12 11:44:57 -07:00
Joakim Erdfelt bdefbdfcf0 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-12 11:44:16 -07:00
WalkerWatch 83d99159f6 First pass of Chapter 8 cleanup. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-11 17:49:59 -04:00
WalkerWatch aa6685e1f8 Chapter 7 clean up, prose fix. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-11 16:45:23 -04:00
Joakim Erdfelt 7ec1f26d1a Merge branch 'jetty-9.4.x' 2016-07-11 10:32:44 -07:00
Joakim Erdfelt bc9007a9ed Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-11 10:32:33 -07:00
WalkerWatch ced94f0eb8 Chapter 6 fixes, removal of Quickstart pieces for #679. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-08 16:37:54 -04:00
Joakim Erdfelt eadd78164f Merge branch 'jetty-9.4.x' 2016-07-08 08:45:56 -07:00
Joakim Erdfelt 66dfe7a5c2 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-08 08:45:39 -07:00
Joakim Erdfelt 2cfc5b1665 Merge branch 'jetty-9.4.x' 2016-07-08 08:40:28 -07:00
WalkerWatch e4807076b2 Resolves #701 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-08 10:47:49 -04:00
Greg Wilkins 16c43727bf Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-08 21:19:53 +10:00
WalkerWatch db9a8dc962 Updates to Intro, Chapter 5 and ResourceHandler example for #687. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-07 16:34:58 -04:00
WalkerWatch f73423be9c Chapter 4 updates and corrections. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-07 12:41:14 -04:00
Greg Wilkins 2ee64a8d56 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-07 11:49:00 +10:00
Greg Wilkins 8675c17d92 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-07 11:46:38 +10:00
WalkerWatch c96e58fa37 Chapter 2 and 3 updates. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-06 14:00:50 -04:00
Jan Bartel ca0c7eb85c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-05 18:01:55 +10:00
Jan Bartel 44e95a2fcd Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-05 18:01:13 +10:00
Joakim Erdfelt 173a5d8724 Merge pull request #683 from WalkerWatch/jetty-9.3.x 
Updated Chapter listing & misc changes
 2016-07-01 08:52:48 -07:00
WalkerWatch 2214dda719 Merge branch 'jetty-9.3.x' of https://github.com/WalkerWatch/jetty.project into jetty-9.3.x 2016-07-01 11:25:55 -04:00
WalkerWatch f830bb35d5 Updated chapter listing 
Signed-off-by: WalkerWatch <chris@webtide.com>
 2016-07-01 11:23:43 -04:00
Joakim Erdfelt 6f88e74514 Merge branch 'jetty-9.4.x' 2016-06-29 15:12:53 -07:00
Joakim Erdfelt 2aa2f12eca Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-29 15:12:37 -07:00
Jan Bartel ae4472ca28 Issue #658 
Added documentation.
 2016-06-29 15:46:15 +10:00
WalkerWatch 1f74d10358 Fixing link and grammatical changes for JMX Dump; added updated diagram for configuration. (#666) 
* Fixing link and grammatical changes.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>

* Updating diagram of configuration elements.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-06-29 09:35:04 +10:00
WalkerWatch 9ce27beb3b Updating diagram of configuration elements. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-06-25 20:55:41 -04:00
WalkerWatch aa054c85af Fixing link and grammatical changes. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-06-25 20:44:22 -04:00
Jesse McConnell ae931538ab [maven-release-plugin] prepare for next development iteration 2016-06-22 13:59:10 -05:00
Jesse McConnell df1ed4fb03 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 13:59:06 -05:00
Jesse McConnell 030ec61837 [maven-release-plugin] prepare for next development iteration 2016-06-22 09:14:25 -05:00
Jesse McConnell 9a4cb41122 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 09:14:21 -05:00
Jesse McConnell e7034117ea [maven-release-plugin] prepare for next development iteration 2016-06-21 08:50:13 -05:00
Jesse McConnell 16c435c69d [maven-release-plugin] prepare release jetty-9.3.10.v20160621 2016-06-21 08:50:09 -05:00
Greg Wilkins 8dd61c6d1c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-15 18:07:01 +10:00
Greg Wilkins e607acfa4e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-15 18:06:32 +10:00
WalkerWatch 69804f9e76 Chapter 24 touch-ups. (#635) 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-06-15 15:55:11 +10:00
Jesse McConnell c6172c9f2e Merge branch 'jetty-9.4.x' 2016-06-09 14:18:52 -05:00
Jesse McConnell 147df2a031 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-09 14:18:27 -05:00
Jesse McConnell 7e3db100ab resolve version expansion across blocks by adding subs= attributes 2016-06-09 14:18:04 -05:00
Jesse McConnell e70c586533 Merge branch 'jetty-9.4.x' 2016-06-07 15:52:23 -05:00
Jesse McConnell 4283c15fe1 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-07 15:52:07 -05:00
WalkerWatch ef63395b07 Removed references to SPDY in Chapter 3, updated Chapter 10 with general info on Sessions 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-06-07 16:40:24 -04:00
Jesse McConnell e79c4d582b Merge branch 'jetty-9.4.x' 2016-06-07 11:57:39 -05:00
Jesse McConnell 20c1301203 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-07 11:56:27 -05:00