Commit Graph

438 Commits

Author SHA1 Message Date
Simone Bordet f7302a13b4 Merged branch 'jetty-9.4.x' into 'master'. 2017-08-01 11:21:41 +02:00
Simone Bordet c04c395833 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-08-01 11:21:05 +02:00
Simone Bordet b616249603 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-08-01 11:14:28 +02:00
WalkerWatch 3e22706210 Merge remote-tracking branch 'origin' 2017-07-26 12:05:25 -04:00
WalkerWatch ba83772dc4 Updated web-default.xml documentation. Resolves #1462. 2017-07-26 11:58:49 -04:00
Simone Bordet 9d767e405e Merged branch 'origin/jetty-9.4.x' into 'master'. 2017-07-24 11:23:50 +02:00
Simone Bordet 4f3c48e818 Merge branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-07-24 11:23:15 +02:00
Simone Bordet 8568fe18d8 Updated ALPN documentation for JDK 8u141. 2017-07-24 11:22:49 +02:00
Greg Wilkins b358c06974 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-18 12:46:44 +02:00
WalkerWatch f80ff4f544 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-07-14 12:16:40 -04:00
WalkerWatch 9063b359d4 Restoring SSL dump info 2017-07-14 12:16:00 -04:00
WalkerWatch c0d87fd0c2 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
# Conflicts:
#	jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc
2017-07-14 12:07:51 -04:00
WalkerWatch 629e41526e Updates to SSL documentation. Resolves #1667 2017-07-14 11:17:51 -04:00
Joakim Erdfelt a9c329859d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-12 13:18:12 -07:00
Joakim Erdfelt 2e8f9fc748 Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch"
This reverts commit 38c112764d.
2017-07-12 11:28:32 -07:00
Joakim Erdfelt 5b6b80ef81 Merge remote-tracking branch 'origin/jetty-9.4.x' into backport-jws11 2017-07-12 11:18:20 -07:00
WalkerWatch 60335bf8fe Documentation update for Connectors. Resolves #1663 2017-07-12 11:34:14 -04:00
Joakim Erdfelt ee8d4c1587 gitattributes followup 2017-07-06 16:24:31 -07:00
WalkerWatch 1341b47ad6 Resolves #1408 2017-06-29 14:09:37 -04:00
Joakim Erdfelt 38c112764d Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch 2017-06-28 16:42:37 -07:00
WalkerWatch 0bfc41e068 Script doco update 2017-06-22 17:18:01 -04:00
Greg Wilkins 7fd45b6766 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-22 11:24:21 +02:00
S K 3cca6642d1 Issue #1622 - HeaderFilter does not work if response has been committed (#1628)
Signed-off-by: S K (xz64) <xz64.xyz@gmail.com>
2017-06-22 08:18:30 +02:00
Joakim Erdfelt 579b99c2c9 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-20 08:43:51 -07:00
WalkerWatch de976e8777 Updating SSL documentation for clarity. 2017-06-20 09:08:19 -04:00
Joakim Erdfelt 5638f7b25b Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-16 14:33:01 -07:00
S K (xz64) 4af81674d2 add general purpose header filters
Signed-off-by: S K (xz64) <xz64.xyz@gmail.com>
2017-06-15 09:08:38 -07:00
olivier lamy 53eee555c5 modify module names after Jan review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-14 14:52:08 +10:00
Joakim Erdfelt 00beb607fc Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-13 10:40:02 -07:00
olivier lamy dae0b7fde3 add documentation page for hazelcast session manager module
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-13 18:34:55 +10:00
Joakim Erdfelt 76ace004b6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-09 09:17:43 -07:00
olivier lamy a63e91d324 apply changes after review #1571
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:23 +10:00
olivier lamy 0c3b3dffce revert change for session-configuration-infinispan.adoc. will be part of an other pr
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:23 +10:00
olivier lamy d0ab064789 add entry in chapter.adoc for hazelcast session management #1571
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:23 +10:00
olivier lamy 98f8405771 add documentation page for Hazelcast session management #1571
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:23 +10:00
Joakim Erdfelt 5ee1c7a533 Merge branch 'release-9.4.6' into jetty-9.4.x 2017-06-07 10:01:11 -07:00
Joakim Erdfelt 828afa0020 Merge branch 'release-9.3.20' into jetty-9.3.x 2017-06-07 09:58:56 -07:00
WalkerWatch 8a07b46949 Updating 9.3.x for #1598 2017-06-06 15:37:00 -04:00
WalkerWatch ccdf0a339d Updating 9.4.x for #1598 2017-06-06 15:36:19 -04:00
WalkerWatch 0abdbedf5e Updating documentation for 9.4.x for #1598 2017-06-06 15:10:53 -04:00
WalkerWatch 5819fcd13b Updating documentation. Resolves #1598 2017-06-06 15:09:35 -04:00
WalkerWatch 85b33827a7 Updating 9.4.x for #1598 2017-06-06 15:04:26 -04:00
Simone Bordet b953f8d2d0 Merged branch 'jetty-9.4.x' into 'master'. 2017-06-05 18:07:51 +02:00
olivier lamy 2c25b6c977 fix typo in session-configuration-infinispan documentation #1583
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-01 14:19:01 +10: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
Greg Wilkins ab4d300ae7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-30 17:43:19 +02:00
WalkerWatch c9c284f432 Sessions doco update 2017-05-30 10:14:27 -04:00