merge hard reset
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/00b5e391 Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/00b5e391 Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/00b5e391 Branch: refs/heads/master Commit: 00b5e3911a774af003b7d7291c147fc50bc21c32 Parents: 4e442bb 26eab98 Author: tballison <talli...@mitre.org> Authored: Tue Apr 25 08:53:31 2017 -0400 Committer: tballison <talli...@mitre.org> Committed: Tue Apr 25 08:53:31 2017 -0400 ---------------------------------------------------------------------- .../compressors/CompressorStreamFactory.java | 36 ++++---------------- .../compressors/DetectCompressorTestCase.java | 21 ++++++++++-- 2 files changed, 24 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-compress/blob/00b5e391/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java ----------------------------------------------------------------------