This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 85737d13dae292040dd75293bfb6ee4a6b6c3f26
Merge: 2c6441a 18b80a3
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Dec 26 10:51:33 2020 -0500
Merge branch 'master' of
https://ggreg...@gitbox.apache.org/repos/asf/commons-io.git
src/main/java/org/apache/commons/io/FileUtils.java | 14 ++--
.../apache/commons/io/file/NoopPathVisitor.java | 2 +-
.../commons/io/filefilter/AndFileFilter.java | 2 +-
.../apache/commons/io/filefilter/OrFileFilter.java | 2 +-
.../apache/commons/io/output/TeeOutputStream.java | 2 +-
.../org/apache/commons/io/CharsetsTestCase.java | 3 +-
.../java/org/apache/commons/io/CopyUtilsTest.java | 17 ++---
.../org/apache/commons/io/FileUtilsTestCase.java | 16 ++---
.../org/apache/commons/io/IOUtilsCopyTestCase.java | 41 +++++------
.../org/apache/commons/io/IOUtilsTestCase.java | 12 ++--
.../apache/commons/io/IOUtilsWriteTestCase.java | 79 +++++++++++-----------
.../commons/io/input/ReaderInputStreamTest.java | 3 +-
.../io/input/UnixLineEndingInputStreamTest.java | 5 +-
.../io/input/WindowsLineEndingInputStreamTest.java | 5 +-
.../commons/io/input/XmlStreamReaderTest.java | 3 +-
.../io/monitor/AbstractMonitorTestCase.java | 2 +-
.../apache/commons/io/output/ProxyWriterTest.java | 2 -
.../commons/io/output/WriterOutputStreamTest.java | 5 +-
.../java/org/apache/commons/io/test/TestUtils.java | 3 +-
19 files changed, 113 insertions(+), 105 deletions(-)
