Commit Graph

188 Commits

Author SHA1 Message Date
Jesse McConnell 6d9b02a897 Merge branch 'jetty-9.4.x' 2016-08-18 14:37:16 -05:00
Jesse McConnell c80fe2b0b9 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-18 14:34:57 -05:00
Jesse McConnell 2b9a4ead3d Resolve #725 add page for reporting security issues 2016-08-18 13:53:08 -05:00
Jesse McConnell f2255944a1 merge 9.4.x 2016-08-18 10:09:46 -05:00
Jesse McConnell d0beca546d merge from 9.3.x 2016-08-18 10:09:07 -05:00
Jesse McConnell 2bfdc41a45 Merge pull request #849 from WalkerWatch/jetty-9.4.x
Clean up of Startup examples.
2016-08-18 10:06:09 -05:00
Jesse McConnell 10a86e73fc Merge pull request #852 from WalkerWatch/issues/843
Resolves #843
2016-08-18 10:05:54 -05:00
Jesse McConnell c1c5e76c4c Merge pull request #838 from WalkerWatch/docupdates/Sessions
Sessions redux rough drafts.
2016-08-18 10:05:38 -05:00
WalkerWatch 1635bc6b12 Resolves #843
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-17 11:00:45 -04:00
WalkerWatch 483cc3abbf Updates for Sessions overhaul.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-17 10:57:03 -04:00
WalkerWatch 5dbe4aa5fa Clean up of Startup examples.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-16 16:19:55 -04:00
WalkerWatch 405de2db8f Sessions redux rough drafts.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-12 12:59:16 -04:00
Jesse McConnell 3d939de0a8 Merge branch 'jetty-9.4.x' 2016-08-10 09:59:27 -05:00
Jesse McConnell 4c6f6fc290 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-10 09:59:04 -05:00
Jesse McConnell 1bff5c0d6a Merge pull request #823 from WalkerWatch/docupdates/Cleanup
Doc flow cleanup.
2016-08-10 09:58:39 -05:00
WalkerWatch ed3168a57b Doc flow cleanup.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-08 17:09:57 -04:00
WalkerWatch c8036e540f Updates for Jetty Handlers.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-05 14:04:11 -04:00
Jesse McConnell a5a5098d90 Merge branch 'jetty-9.4.x' 2016-08-02 14:48:37 -05:00
Jesse McConnell 6108b9a234 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-02 14:48:14 -05:00
WalkerWatch 271728ef7d Jetty and Maven updates.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-01 17:55:54 -04:00
Jesse McConnell c16ff0f49f Merge branch 'jetty-9.4.x' 2016-07-29 16:13:56 -05:00
Jesse McConnell 0ecc8caff6 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-29 16:13:38 -05:00
WalkerWatch 5edc2a0bb3 Chapter 22 revisions and misc adoc updates.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-29 16:40:25 -04:00
Joakim Erdfelt 2830e51e04 Merge branch 'jetty-9.3.x' into release-9.3.11 2016-07-28 12:20:36 -07:00
Jesse McConnell 5b85eccee4 Merge branch 'jetty-9.4.x' 2016-07-28 12:20:23 -05:00
Jesse McConnell a2d37ad98d Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-28 12:20:08 -05:00
Jesse McConnell b45fbbfd04 Merge pull request #781 from WalkerWatch/docupdates/Chapter20
Chapter 20 cleanup.
2016-07-28 12:19:21 -05:00
WalkerWatch 431d2fb016 Chapter 20 cleanup.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-27 13:29:12 -04:00
WalkerWatch 98005ea9ab Resolves #761
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-27 07:58:24 -04:00
Greg Wilkins e93fa6c141 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-27 10:39:37 +10:00
Greg Wilkins 8d380220c4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-27 10:35:37 +10:00
WalkerWatch 5a1263b4bd Docupdates/jetty runner (#772)
* Updates to Servlets/Filters/Handlers in Chapter 17.

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

* Jetty Runner doc updates.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-27 10:28:40 +10:00
Jesse McConnell de2465d0dd Merge branch 'jetty-9.4.x' 2016-07-26 07:53:55 -05:00
Jesse McConnell e9140a30b2 merging 9.3 to 9.4 2016-07-26 07:53:17 -05:00
Jesse McConnell 0adee58367 Merge pull request #769 from WalkerWatch/jetty-9.3.x
Fixing doc rendering issue.
2016-07-26 07:51:46 -05:00
Jesse McConnell 043b494c57 Merge pull request #763 from WalkerWatch/docupdates/chapter17
Chapter 17 cleanup.
2016-07-26 07:51:38 -05:00
WalkerWatch 288ebe8d30 Fixing doc rendering issue.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-26 08:48:03 -04:00
Jesse McConnell 42d1647413 Merge branch 'jetty-9.4.x' 2016-07-22 17:32:47 -05:00
Jesse McConnell f3fe72a708 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-22 17:32:27 -05:00
WalkerWatch 232ca5b1d8 Resolves #764."
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-22 18:14:14 -04:00
WalkerWatch e368f3d8ee Chapter 17 cleanup.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-22 14:53:18 -04:00
Jesse McConnell bfeedc6f5e Merge branch 'jetty-9.4.x' 2016-07-22 12:09:00 -05:00
Jesse McConnell 85af98b483 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-22 12:08:40 -05:00
Jesse McConnell e800e616d6 Merge pull request #758 from WalkerWatch/docupdates/chapter16
Chapter 16 updates
2016-07-22 12:08:11 -05: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
WalkerWatch 7c9f3ec727 Chapter 16 updates
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-21 17:19:25 -04:00
WalkerWatch 127028d4d9 Chapter 15 cleanup
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-21 12:34:30 -04:00
Simone Bordet 98454b8726 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-21 17:50:51 +02:00
Simone Bordet cf0ecbd88f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-21 17:50:08 +02:00