Branch: refs/heads/master Home: https://github.com/qos-ch/logback Commit: cf3c1d3eae831d53b2356f325a86f91dedda7a13 https://github.com/qos-ch/logback/commit/cf3c1d3eae831d53b2356f325a86f91dedd... Author: Ville Koskela <vkoskela@groupon.com> Date: 2015-11-25 (Wed, 25 Nov 2015) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java M logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java M logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java M logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_Test.java Log Message: ----------- Allow max history on the TimeBasedRollingPolicy to be interpreted as the number of files by SizeAndTimeBasedFNATP to limit the total disk used by rolled log files. The change is backwards compatible; the new behavior is controlled by the historyAsFileCount flag on SizeAndTimeBasedFNATP. This addresses the issue described in LOGBACK-747. Commit: cb9cefe85f16e8ce935fe16a94060ef0d1fc2678 https://github.com/qos-ch/logback/commit/cb9cefe85f16e8ce935fe16a94060ef0d1f... Author: Ceki Gulcu <ceki@qos.ch> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java M logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java M logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java M logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_Test.java Log Message: ----------- revert to 2 space indentation to favilitate PR merge Commit: fd5693572fe3e268defec0fa7460b8655c4147e4 https://github.com/qos-ch/logback/commit/fd5693572fe3e268defec0fa7460b8655c4... Author: Ceki Gulcu <ceki@qos.ch> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java M logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java M logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java M logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_Test.java Log Message: ----------- merging https://github.com/qos-ch/logback/pull/287 Commit: a481e4d068a5203f29c4808794eeb93914f12123 https://github.com/qos-ch/logback/commit/a481e4d068a5203f29c4808794eeb93914f... Author: Ceki Gulcu <ceki@qos.ch> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java M logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java M logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java M logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_Test.java Log Message: ----------- Merge branch 'vjkoskela' Compare: https://github.com/qos-ch/logback/compare/a7cb9ee033cd...a481e4d068a5