Branch: refs/heads/LOGBACK-848 Home: https://github.com/qos-ch/logback Commit: 6e7605be8fd67512e660f3c6afb263d540e2a22c https://github.com/qos-ch/logback/commit/6e7605be8fd67512e660f3c6afb263d540e... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/ContextBase.java M logback-core/src/test/java/ch/qos/logback/core/ContextBaseTest.java Log Message: ----------- modified ContextBase to shut down executor service on reset Commit: f9492ad0adace53ec2d02e559e9077c78193a13f https://github.com/qos-ch/logback/commit/f9492ad0adace53ec2d02e559e9077c7819... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M logback-site/src/site/images.src/serverSocketReceiver.odg M logback-site/src/site/resources/manual/images/chapters/receivers/serverSocketReceiver.png Log Message: ----------- corrected typo and other bugs in imgaes Commit: a62ba6b7f13bfe411c43ec4d5ca2da834cdd22c5 https://github.com/qos-ch/logback/commit/a62ba6b7f13bfe411c43ec4d5ca2da834cd... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M logback-site/src/site/images.src/serverSocketReceiver.odg M logback-site/src/site/images.src/socketReceiver.odg M logback-site/src/site/resources/manual/images/chapters/receivers/serverSocketReceiver.png M logback-site/src/site/resources/manual/images/chapters/receivers/socketReceiver.png Log Message: ----------- listen for connections Commit: b9ad32e08fba70ca3a9102c2e28d9c11d4e44a9d https://github.com/qos-ch/logback/commit/b9ad32e08fba70ca3a9102c2e28d9c11d4e... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M logback-access/src/main/java/ch/qos/logback/access/net/SSLSocketAppender.java M logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java M logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketAppender.java M logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketReceiver.java M logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java M logback-classic/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java M logback-classic/src/main/java/ch/qos/logback/classic/net/server/ServerSocketReceiver.java M logback-classic/src/test/java/ch/qos/logback/classic/net/SocketMin.java M logback-core/src/main/java/ch/qos/logback/core/net/server/ServerSocketAppenderBase.java Log Message: ----------- Merge branch 'master' of github.com:qos-ch/logback Commit: bb5df9f85e8245a03a02937ba6a25c49ab96e1fa https://github.com/qos-ch/logback/commit/bb5df9f85e8245a03a02937ba6a25c49ab9... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/net/ssl/SSLContextFactoryBean.java Log Message: ----------- allow JSSE system properties to influence SSLContextFactoryBean The JSSE defines several system properties that are used to create key store and trust store objects for the system default SSL context. This commit allows these properties to be referenced as defaults when a component's SSL configuration does not provide either the key store or trust store configuration. Commit: 10d475772409cad2bc29c49930293aa17885a86e https://github.com/qos-ch/logback/commit/10d475772409cad2bc29c49930293aa1788... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/net/ssl/SSLContextFactoryBean.java Log Message: ----------- Merge branch 'master' of github.com:qos-ch/logback Commit: 372e0d1577562ab24d76b84584c3558cc86a0d6e https://github.com/qos-ch/logback/commit/372e0d1577562ab24d76b84584c3558cc86... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/ContextBase.java M logback-core/src/test/java/ch/qos/logback/core/ContextBaseTest.java Log Message: ----------- Merge branch 'LOGBACK-849' of github.com:qos-ch/logback into LOGBACK-849 Commit: 63985bd4cafa522233c7cba2779ac4a4f3150082 https://github.com/qos-ch/logback/commit/63985bd4cafa522233c7cba2779ac4a4f31... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java M logback-core/src/test/java/ch/qos/logback/core/contention/WaitOnExecutionMultiThreadedHarness.java Log Message: ----------- tests pass Commit: 1911c7fb7e8f90dc95de793a686472a432888751 https://github.com/qos-ch/logback/commit/1911c7fb7e8f90dc95de793a686472a4328... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M logback-access/src/main/java/ch/qos/logback/access/net/SSLSocketAppender.java M logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java R logback-access/src/test/java/ch/qos/logback/access/net/MockSocketServer.java M logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java R logback-access/src/test/java/ch/qos/logback/access/net/SocketAppenderTest.java M logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketAppender.java M logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java M logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java R logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java M logback-classic/src/test/java/ch/qos/logback/classic/net/server/SSLServerSocketReceiverTest.java M logback-classic/src/test/java/ch/qos/logback/classic/net/server/ServerSocketReceiverTest.java M logback-core/src/main/java/ch/qos/logback/core/net/SSLSocketAppenderBase.java M logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java A logback-core/src/test/java/ch/qos/logback/core/net/SocketAppenderBaseTest.java M logback-core/src/test/java/ch/qos/logback/core/net/mock/MockContext.java A logback-core/src/test/java/ch/qos/logback/core/net/mock/MockExecutorService.java M logback-core/src/test/java/ch/qos/logback/core/net/server/ConcurrentServerRunnerTest.java R logback-core/src/test/java/ch/qos/logback/core/net/server/MockContext.java R logback-core/src/test/java/ch/qos/logback/core/net/server/MockExecutorService.java M logback-core/src/test/java/ch/qos/logback/core/net/server/RemoteReceiverStreamClientTest.java M logback-core/src/test/java/ch/qos/logback/core/net/server/ServerSocketAppenderBaseFunctionalTest.java M logback-core/src/test/java/ch/qos/logback/core/net/server/ServerSocketAppenderBaseTest.java Log Message: ----------- Merge branch 'LOGBACK-848' of github.com:qos-ch/logback into LOGBACK-848 Compare: https://github.com/qos-ch/logback/compare/16d67e508b95...1911c7fb7e8f