Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,778 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

12778 Commits

Author SHA1 Message Date
Joakim Erdfelt ed8310dbff Merge branch 'jetty-9.4.x' 2016-06-28 13:48:12 -07:00
Joakim Erdfelt ac90d2b562 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-28 13:47:54 -07:00
Joakim Erdfelt bba1c19875 Fixes #668 - Introduce optional `jetty.deploy.defaultsDescriptorPath` for jetty-deploy defaults descriptor outside of ${jetty.home} 2016-06-28 13:44:36 -07:00
Joakim Erdfelt 1ac1673396 Fixes #667 - Alternate `jetty.deploy.monitoredDirPath` for jetty-deploy outside of ${jetty.base} 2016-06-28 13:39:28 -07:00
Joakim Erdfelt b20e2ddf18 Fixes #672 - Allow logging configuration announcement to be programmatically disabled 2016-06-28 13:01:16 -07:00
Jan Bartel 3e937c4891 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-24 19:11:21 +10:00
Jan Bartel 00f9b99d02 Issue #663 
Fix accidental removal of arg to InfinispanTestServer.
 2016-06-24 19:10:57 +10:00
Greg Wilkins 81f78bf16f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-24 18:40:32 +10:00
Greg Wilkins d0d11244b3 Issue #644 Modules for logging 
Added module for logback-access
 2016-06-24 18:40:00 +10:00
Jan Bartel ef65639674 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-24 16:22:23 +10:00
Jan Bartel 0889a66f9c Issue #663 2016-06-24 16:21:25 +10:00
Jan Bartel b1c62f81d9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-24 16:11:01 +10:00
Greg Wilkins 26276575e7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-24 15:40:21 +10:00
Jan Bartel 225c6a8086 Issue #663 
Also fix javadoc; fix memcached module
 2016-06-24 15:38:25 +10:00
Greg Wilkins 7df3b83a8e Issue #644 Modules for logging 
Added logback classic modules
 2016-06-24 14:42:34 +10:00
Greg Wilkins cfe5abf8e6 Issue #660 NPE in Request 
Made request more robust for calls after reset.
 2016-06-24 14:33:18 +10:00
Greg Wilkins 0e0fc77771 skip symlink test on windows 2016-06-24 14:33:18 +10:00
Simone Bordet 237502932a Merged branch 'jetty-9.4.x' into 'master'. 2016-06-23 13:04:06 +02:00
Simone Bordet ab45979a13 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-23 13:02:53 +02:00
Simone Bordet 9d9df416af Fixes #643 - NPE in passing websocket client test. 2016-06-23 13:00:04 +02:00
Greg Wilkins 0239d6390f Issue #644 Modules for logging 
module for direct slf4j to log4j2 bridge
 2016-06-23 15:32:18 +10:00
Greg Wilkins 501b8e9dca Issue #644 Modules for logging 
Added log4j2.xml configuration
Added jetty-log4j2 mapping module
 2016-06-23 15:21:34 +10:00
Jan Bartel 9d71faad07 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 14:50:32 +10:00
Jan Bartel 4e364a5642 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-23 14:50:07 +10:00
Jan Bartel 0879b44d37 Issue #658 
Add backoff retries for gcloud session save.
 2016-06-23 14:48:47 +10:00
Jan Bartel 34aa4d078c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 14:19:24 +10:00
Jan Bartel 3f10652361 Allow a list of memcached servers to be configured for session caching. 2016-06-23 14:18:48 +10:00
Greg Wilkins 84b3e2e616 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 14:11:53 +10:00
Greg Wilkins e3936d2046 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-23 14:11:29 +10:00
Greg Wilkins c3173932f0 Revert "Issue #660 - simplifying parameter extraction to prevent NPE" 
This reverts commit ecea486d07.
 2016-06-23 12:43:29 +10:00
Jan Bartel 2793812fcb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 12:26:16 +10:00
Jan Bartel a0e7b21180 Make SessionDataMap a LifeCycle 2016-06-23 12:25:33 +10:00
Jan Bartel f1d9cf89a4 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 12:04:59 +10:00
Jan Bartel 3c6dab9790 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-06-23 12:04:15 +10:00
Jan Bartel 26310f1167 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-23 12:03:08 +10:00
Greg Wilkins 5c7b0247e7 Issue #627 Use start.d or start.ini not both 
Added --create-startd option
Improved tests
 2016-06-23 12:01:07 +10:00
Jan Bartel 67f8a96eee Issue #658 
Add unit tests for memcached with gcloud.
 2016-06-23 11:23:44 +10:00
Greg Wilkins e4eafd0fee Issue #644 Modules for logging 
parameterized logging versions
 2016-06-23 09:54:28 +10:00
Greg Wilkins 80903c5ab1 Issue #644 Modules for logging 
Added a jetty-log4j module that depends internally on slf4j
 2016-06-23 08:38:29 +10:00
Jan Bartel 0ca191edff Issue #658 2016-06-23 07:49:11 +10:00
Jesse McConnell 2dd4843e44 merge from 9.4.x 2016-06-22 15:28:17 -05:00
Jesse McConnell 399c5beb04 merge from 9.3.x 2016-06-22 15:23:51 -05:00
Jesse McConnell 0c66b9d25b Merge branch 'release-9.3.10' into jetty-9.3.x 2016-06-22 15:04:12 -05: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 94fdff47a0 set for release 2016-06-22 13:27:41 -05:00
Jesse McConnell 2b947e8f72 Merge branch 'jetty-9.3.x' into release-9.3.10 2016-06-22 13:22:27 -05:00
Joakim Erdfelt 0a196e2123 Merge branch 'jetty-9.4.x' 2016-06-22 10:43:58 -07:00
Joakim Erdfelt 8157a4533c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-22 10:43:43 -07:00
Joakim Erdfelt b3635df543 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-06-22 10:43:27 -07:00