Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-22 23:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,662 Commits 55 Branches 466 Tags
Commit Graph

14662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simone Bordet
82462eafb7 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-07-24 11:39:24 +02:00
Simone Bordet
bfecc82ad1 Fixes #1687 - Missing callback notification when channel not found. 2017-07-24 11:35:41 +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
Simone Bordet
4b0003f086 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-07-24 11:13:32 +02:00
Simone Bordet
6782a6fafd Fixed location of ALPN files for JDK 8u141. 2017-07-24 10:50:48 +02:00
Simone Bordet
7b84df341f JavaDoc clarification. 2017-07-24 10:45:13 +02:00
Simone Bordet
a0026fd9d2 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-07-24 10:44:39 +02:00
Simone Bordet
3f94a5d132 Fixes #1685 - Update ALPN support for Java 8u141. 2017-07-24 10:08:10 +02:00
Joakim Erdfelt
232477b6ad Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-07-20 11:23:08 -07:00
Joakim Erdfelt
a2a0360269 Fixed #1679 - moving JMX specific behavior to jmx.DeploymentManagerMBean 2017-07-20 11:22:54 -07:00
Jan Bartel
4b27499bbc Issue #1681 
(cherry picked from commit 0d99bde0c1e740493b6dfab772b3c4933c1e7d75)
 2017-07-20 16:15:03 +02:00
Jan Bartel
41938b2310 Issue #1623 
Ensure restarts recreate classpath.
 2017-07-20 13:24:46 +02:00
Jan Bartel
fd6b3f198c Merge pull request #1680 from olamy/bugfix/maven_plugin_fix_master 
Bugfix/maven plugin fix master
 2017-07-20 10:18:18 +02:00
olivier lamy
1b5b59cca3 some cleanup per Jan review 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-07-20 14:10:42 +10:00
Joakim Erdfelt
b838a236bf Fixed #1679 - making DeploymentManager usable in JMX without error 2017-07-19 15:29:31 -07:00
Joakim Erdfelt
300bde1535 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-07-19 14:51:47 -07:00
Joakim Erdfelt
568ba61c76 Fixing module [name] warning 2017-07-19 14:51:41 -07:00
Joakim Erdfelt
06e5ed6560 Merge remote-tracking branch 'origin/issue-1642' into jetty-9.4.x 2017-07-19 10:36:42 -07:00
Joakim Erdfelt
2bcdf29cb3 Merge remote-tracking branch 'remotes/origin/issue-1642' into jetty-9.4.x 2017-07-19 10:33:20 -07:00
olivier lamy
c78ba059c0 simplify code, add more details in junit failure #1623 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-07-19 21:50:37 +10:00
Jan Bartel
650bc4bf89 Issue #1675 2017-07-18 09:44:58 +02:00
Joakim Erdfelt
273dcc4131 Improving output seen during websocket-tests to squelch known stacktraces produced by testcase 2017-07-17 14:18:17 -07:00
Joakim Erdfelt
068a1f9e40 Removing Test/Testing related commits from VERSION.txt 2017-07-17 14:17:40 -07:00
Greg Wilkins
36abb7e295 Fix #1672 Proxy tests HttpTester.from usage 2017-07-17 15:24:33 +02:00
Greg Wilkins
6b095d823d Issue #1671 asymmetric trailer usage on MetaData.Request 2017-07-17 11:37:03 +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
Greg Wilkins
28cfb3f495 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-07-14 07:27:06 +02:00
Greg Wilkins
cadf8cb16f fixed merge 2017-07-13 16:51:24 +02:00
Jan Bartel
f68a3a66ef Issue #1645 2017-07-13 16:04:46 +02:00
Greg Wilkins
8ca8735c95 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-07-13 15:41:54 +02:00
Greg Wilkins
7b1d4c7ccf Fix #1664 CIDR IP 2017-07-13 15:41:21 +02:00
Greg Wilkins
6244d0df3c Issue #1661 remove debug 2017-07-13 14:16:51 +02:00
Greg Wilkins
8795781923 Issue #1661 Portable onProxyResponseFailure 
avoid using sendError(-1)
 2017-07-13 14:14:36 +02:00
Jan Bartel
321b61d33f Merge pull request #1634 from vjyanand/jetty-9.4.x 
Fix Typo
 2017-07-13 14:05:00 +02:00
Greg Wilkins
4d713e725d fixed bad pom parent version 2017-07-13 13:47:53 +02:00
Joakim Erdfelt
2e8f9fc748 Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch" 
This reverts commit 38c112764d6fb606c377e80c9ed45eed92b0a5c3.
 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
c465a9d833 Renaming to fit Eclipse Jetty naming guidelines 2017-07-10 18:17:16 -07:00
Joakim Erdfelt
7129fa7b9b Merge pull request #1644 from olamy/feature/maven_plugin_its 
add maven plugin its tests
 2017-07-10 16:37:09 -07:00
Joakim Erdfelt
9e9a8b66cb Issue #1650 - correcting testcase relying on odd LocalEndPoint behavior 2017-07-07 16:02:15 -07:00
Joakim Erdfelt
22f815ddfd Issue #1650 - testing improvements 2017-07-07 13:16:31 -07:00
Joakim Erdfelt
90d9823307 Issue #1650 - restoring 2 more testcases 2017-07-07 08:41:31 -07:00
Joakim Erdfelt
ee8d4c1587 gitattributes followup 2017-07-06 16:24:31 -07:00
Joakim Erdfelt
986e49ab35 Issue #1650 - fixing Suspend/Resume in websockets 2017-07-06 16:24:07 -07:00
Joakim Erdfelt
73c4dd31a9 Updating .gitattributes 2017-07-05 10:54:57 -07:00