mirror of
https://github.com/jetty/jetty.project.git
synced 2025-02-23 16:05:00 +00:00
Squashed commit of the following: commit 08b5acccf87c3b99152a8042d650aadf7e43c5ff Merge: cea3366 daeb844 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 5 12:43:01 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-1200 commit cea3366625e16debf66e07284ab7afa89e73a32d Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 5 12:42:21 2017 +1000 Issue #1200 ignore OSX failure commit fd2493f2b30ffb19f4b404636e1e38c8612cb502 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 5 12:11:05 2017 +1000 Issue #1789 PropertyUserStoreTest failures on windows commit 89aa59ca7b16a393edc77116b13050d2d8a2c3e2 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 5 11:56:52 2017 +1000 Issue #1200 fixes for windows commit 1904b4566d9224a19729f83a7b49a5ab23aaa5d8 Merge: 74d770e eec6453 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 5 11:45:19 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-1200 commit 74d770e557e8ff613a5965cb430a7b83ee75bd45 Author: Greg Wilkins <gregw@webtide.com> Date: Fri Sep 1 10:47:05 2017 +1000 Issue #1200 fixes for windows commit f4ee0e97dcd0a07257cea8da8b3106f71150957f Author: Greg Wilkins <gregw@webtide.com> Date: Thu Aug 31 10:24:07 2017 +1000 Issue #1200 improved tests for long duration quiet time commit 17381cbb0bbebe3ea27ed5f55caeb45c2856e1be Author: Greg Wilkins <gregw@webtide.com> Date: Thu Aug 31 10:03:04 2017 +1000 Issue #1200 fixed javadoc commit b3a12c15167ce77a9781942680ca2d5c872374dd Merge: ed0db46 ce4adb5 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Aug 31 09:41:50 2017 +1000 Merge branch 'jetty-9.4.x-1200' of github.com:eclipse/jetty.project into jetty-9.4.x-1200 commit ed0db46f495f27491ba58e6c4353cf1ef6f2061e Author: Greg Wilkins <gregw@webtide.com> Date: Thu Aug 31 09:39:46 2017 +1000 Issue #1200 Improved PathWatcher commit ce4adb54ed58d39789ea1ba4f5d58035e57980ce Merge: f993a7c 48aaecb Author: Joakim Erdfelt <joakim.erdfelt@gmail.com> Date: Wed Aug 30 16:38:07 2017 -0700 Merge branch 'jetty-9.4.x-1200' of github.com:eclipse/jetty.project into jetty-9.4.x-1200 commit f993a7c83ee7294a34b00cea68242adb7993e565 Author: Joakim Erdfelt <joakim.erdfelt@gmail.com> Date: Wed Aug 30 16:37:45 2017 -0700 Issue #1200 - adding some important OSX/HFS+ timing differences + We should really be testing the FileSystem (not the OS) to make the timing constants be more sane. (APFS for example should be much lower on newer OSX installations commit 48aaecb4dd291d94d591c1545f671eecff1e3587 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Aug 31 08:50:42 2017 +1000 Issue #1200 Improved PathWatcher diff commit 1917f8b177d163bd42c07d5a2715858e7cf9787a Author: Greg Wilkins <gregw@webtide.com> Date: Thu Aug 31 08:36:40 2017 +1000 Issue #1200 Improved PathWatcher diff commit ecf002395a426ee3c00a4b42a32222e61805234f Author: Greg Wilkins <gregw@webtide.com> Date: Thu Aug 31 08:22:41 2017 +1000 Issue #1200 Test improved PathWatcher commit 0d76544093cbcddd9b29fc2c92a4d0bb0a6839a8 Merge: 0fd7187 eb1320f Author: Greg Wilkins <gregw@webtide.com> Date: Wed Aug 30 16:43:15 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-1200 commit 0fd7187f908ed2d1bed24d5d82e25cb7ec244b0e Author: Greg Wilkins <gregw@webtide.com> Date: Wed Aug 30 15:58:24 2017 +1000 Issue #1200 Improve PathWatcher