You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2014/09/04 19:02:13 UTC
[1/2] git commit: delete stray test log file
Repository: logging-log4j2
Updated Branches:
refs/heads/master 3faed6d42 -> 4b552d5df
delete stray test log file
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e2c32adb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e2c32adb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e2c32adb
Branch: refs/heads/master
Commit: e2c32adb18a0050c5be29e3ddfbf7748148524b2
Parents: 501c6f1
Author: rpopma <rp...@apache.org>
Authored: Fri Sep 5 02:00:39 2014 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Sep 5 02:00:39 2014 +0900
----------------------------------------------------------------------
log4j-core/LOG4J2-807.log | 24 ------------------------
1 file changed, 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e2c32adb/log4j-core/LOG4J2-807.log
----------------------------------------------------------------------
diff --git a/log4j-core/LOG4J2-807.log b/log4j-core/LOG4J2-807.log
deleted file mode 100644
index c19c011..0000000
--- a/log4j-core/LOG4J2-807.log
+++ /dev/null
@@ -1,24 +0,0 @@
-2014-08-29 11:28:47,762 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j configured, will be reconfigured in aprox. 5 sec
-2014-08-29 11:28:48,763 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:28:49,763 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:28:50,763 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:28:51,764 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:28:52,764 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:28:53,764 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:28:54,764 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:35:26,288 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j configured, will be reconfigured in aprox. 5 sec
-2014-08-29 11:35:27,290 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:35:28,291 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:35:29,291 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:35:30,291 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:35:31,291 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:35:32,291 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:35:33,291 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:41:38,331 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j configured, will be reconfigured in aprox. 5 sec
-2014-08-29 11:41:39,332 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:41:40,332 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:41:41,332 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:41:42,332 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:41:43,332 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:41:44,332 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
-2014-08-29 11:41:45,332 INFO [o.a.l.l.c.a.AsyncRootReloadTest] Log4j waiting for reconfiguration
Re: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by Remko Popma <re...@gmail.com>.
Yes, thanks for the heads-up. I also read about that, and Matt also warned
about it.
My understanding is that rebasing before a push is always okay, but if you
do it after a push, people will hate you, and you’ll be scorned by friends
and family. - according to pro-git :-)
On Fri, Sep 5, 2014 at 2:26 AM, Gary Gregory <ga...@gmail.com> wrote:
> I think rebasing can lead to trouble if you have pushed out some commits,
> so beware...
>
>
> On Thu, Sep 4, 2014 at 1:14 PM, Matt Sicker <bo...@gmail.com> wrote:
>
>> Does Eclipse give you the option to rebase and then push? If not, then I
>> think there's a git config option to auto-rebase when doing git pull.
>>
>> n.b.: I use git on the command line for everything except for git commit.
>>
>>
>> On 4 September 2014 12:11, Remko Popma <re...@gmail.com> wrote:
>>
>>> I noticed these emails are generated if I commit something locally and
>>> before I can push it, somebody else pushed their commit. Eclipse then gives
>>> me a warning and I do a pull before I can push my changes.
>>>
>>> However, this results in two emails: one for my original commit, and one
>>> like the below that to me seems like just noise (it just says that I merged
>>> from the remote repository into my local repository)...
>>>
>>> Am I doing something wrong?
>>> If Eclipse gives the warning that I cannot push because the remote
>>> repository has changed, should I rebase instead of pull or something?
>>>
>>>
>>> On Fri, Sep 5, 2014 at 2:02 AM, <rp...@apache.org> wrote:
>>>
>>>> Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
>>>>
>>>> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
>>>> Commit:
>>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4b552d5d
>>>> Tree:
>>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4b552d5d
>>>> Diff:
>>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4b552d5d
>>>>
>>>> Branch: refs/heads/master
>>>> Commit: 4b552d5df02bcf1e208f4a2134d431ecb3d27051
>>>> Parents: e2c32ad 3faed6d
>>>> Author: rpopma <rp...@apache.org>
>>>> Authored: Fri Sep 5 02:01:16 2014 +0900
>>>> Committer: rpopma <rp...@apache.org>
>>>> Committed: Fri Sep 5 02:01:16 2014 +0900
>>>>
>>>> ----------------------------------------------------------------------
>>>> .../logging/log4j/io/ByteStreamLogger.java | 8 +-
>>>> .../logging/log4j/io/CharStreamLogger.java | 2 +-
>>>> .../log4j/io/IncompatibleLoggerException.java | 46 ++++
>>>> .../log4j/io/LoggerBufferedInputStream.java | 51 +---
>>>> .../logging/log4j/io/LoggerBufferedReader.java | 26 +-
>>>> .../log4j/io/LoggerFilterOutputStream.java | 25 +-
>>>> .../logging/log4j/io/LoggerFilterWriter.java | 14 +-
>>>> .../logging/log4j/io/LoggerInputStream.java | 23 +-
>>>> .../logging/log4j/io/LoggerOutputStream.java | 22 +-
>>>> .../logging/log4j/io/LoggerPrintStream.java | 79 +-----
>>>> .../logging/log4j/io/LoggerPrintWriter.java | 46 +---
>>>> .../apache/logging/log4j/io/LoggerReader.java | 17 +-
>>>> .../apache/logging/log4j/io/LoggerStreams.java | 267
>>>> +++++++++++--------
>>>> .../apache/logging/log4j/io/LoggerWriter.java | 12 +-
>>>> .../apache/logging/log4j/io/package-info.java | 20 ++
>>>> .../io/AbstractLoggerOutputStreamTest.java | 18 +-
>>>> .../log4j/io/AbstractLoggerWriterTest.java | 18 +-
>>>> .../logging/log4j/io/AbstractStreamTest.java | 19 +-
>>>> ...LoggerBufferedInputStreamCallerInfoTest.java | 12 +-
>>>> .../log4j/io/LoggerBufferedInputStreamTest.java | 6 +-
>>>> .../io/LoggerBufferedReaderCallerInfoTest.java | 10 +-
>>>> .../log4j/io/LoggerBufferedReaderTest.java | 13 +-
>>>> .../log4j/io/LoggerFilterOutputStreamTest.java | 5 +-
>>>> .../log4j/io/LoggerFilterWriterTest.java | 5 +-
>>>> .../io/LoggerInputStreamCallerInfoTest.java | 9 +-
>>>> .../logging/log4j/io/LoggerInputStreamTest.java | 13 +-
>>>> .../io/LoggerOutputStreamCallerInfoTest.java | 6 +-
>>>> .../log4j/io/LoggerOutputStreamTest.java | 4 +-
>>>> .../io/LoggerPrintStreamCallerInfoTest.java | 12 +-
>>>> .../logging/log4j/io/LoggerPrintStreamTest.java | 13 +-
>>>> .../io/LoggerPrintWriterCallerInfoTest.java | 7 +-
>>>> .../logging/log4j/io/LoggerPrintWriterTest.java | 11 +-
>>>> .../log4j/io/LoggerReaderCallerInfoTest.java | 7 +-
>>>> .../logging/log4j/io/LoggerReaderTest.java | 9 +-
>>>> .../io/LoggerStreamsCallerInfoTesting.java | 8 +-
>>>> .../logging/log4j/io/LoggerWriterTest.java | 4 +-
>>>> 36 files changed, 418 insertions(+), 449 deletions(-)
>>>> ----------------------------------------------------------------------
>>>>
>>>>
>>>>
>>>
>>
>>
>> --
>> Matt Sicker <bo...@gmail.com>
>>
>
>
>
> --
> E-Mail: garydgregory@gmail.com | ggregory@apache.org
> Java Persistence with Hibernate, Second Edition
> <http://www.manning.com/bauer3/>
> JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
> Spring Batch in Action <http://www.manning.com/templier/>
> Blog: http://garygregory.wordpress.com
> Home: http://garygregory.com/
> Tweet! http://twitter.com/GaryGregory
>
Re: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by Gary Gregory <ga...@gmail.com>.
I think rebasing can lead to trouble if you have pushed out some commits,
so beware...
On Thu, Sep 4, 2014 at 1:14 PM, Matt Sicker <bo...@gmail.com> wrote:
> Does Eclipse give you the option to rebase and then push? If not, then I
> think there's a git config option to auto-rebase when doing git pull.
>
> n.b.: I use git on the command line for everything except for git commit.
>
>
> On 4 September 2014 12:11, Remko Popma <re...@gmail.com> wrote:
>
>> I noticed these emails are generated if I commit something locally and
>> before I can push it, somebody else pushed their commit. Eclipse then gives
>> me a warning and I do a pull before I can push my changes.
>>
>> However, this results in two emails: one for my original commit, and one
>> like the below that to me seems like just noise (it just says that I merged
>> from the remote repository into my local repository)...
>>
>> Am I doing something wrong?
>> If Eclipse gives the warning that I cannot push because the remote
>> repository has changed, should I rebase instead of pull or something?
>>
>>
>> On Fri, Sep 5, 2014 at 2:02 AM, <rp...@apache.org> wrote:
>>
>>> Merge branch 'master' of
>>> https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
>>>
>>> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
>>> Commit:
>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4b552d5d
>>> Tree:
>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4b552d5d
>>> Diff:
>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4b552d5d
>>>
>>> Branch: refs/heads/master
>>> Commit: 4b552d5df02bcf1e208f4a2134d431ecb3d27051
>>> Parents: e2c32ad 3faed6d
>>> Author: rpopma <rp...@apache.org>
>>> Authored: Fri Sep 5 02:01:16 2014 +0900
>>> Committer: rpopma <rp...@apache.org>
>>> Committed: Fri Sep 5 02:01:16 2014 +0900
>>>
>>> ----------------------------------------------------------------------
>>> .../logging/log4j/io/ByteStreamLogger.java | 8 +-
>>> .../logging/log4j/io/CharStreamLogger.java | 2 +-
>>> .../log4j/io/IncompatibleLoggerException.java | 46 ++++
>>> .../log4j/io/LoggerBufferedInputStream.java | 51 +---
>>> .../logging/log4j/io/LoggerBufferedReader.java | 26 +-
>>> .../log4j/io/LoggerFilterOutputStream.java | 25 +-
>>> .../logging/log4j/io/LoggerFilterWriter.java | 14 +-
>>> .../logging/log4j/io/LoggerInputStream.java | 23 +-
>>> .../logging/log4j/io/LoggerOutputStream.java | 22 +-
>>> .../logging/log4j/io/LoggerPrintStream.java | 79 +-----
>>> .../logging/log4j/io/LoggerPrintWriter.java | 46 +---
>>> .../apache/logging/log4j/io/LoggerReader.java | 17 +-
>>> .../apache/logging/log4j/io/LoggerStreams.java | 267
>>> +++++++++++--------
>>> .../apache/logging/log4j/io/LoggerWriter.java | 12 +-
>>> .../apache/logging/log4j/io/package-info.java | 20 ++
>>> .../io/AbstractLoggerOutputStreamTest.java | 18 +-
>>> .../log4j/io/AbstractLoggerWriterTest.java | 18 +-
>>> .../logging/log4j/io/AbstractStreamTest.java | 19 +-
>>> ...LoggerBufferedInputStreamCallerInfoTest.java | 12 +-
>>> .../log4j/io/LoggerBufferedInputStreamTest.java | 6 +-
>>> .../io/LoggerBufferedReaderCallerInfoTest.java | 10 +-
>>> .../log4j/io/LoggerBufferedReaderTest.java | 13 +-
>>> .../log4j/io/LoggerFilterOutputStreamTest.java | 5 +-
>>> .../log4j/io/LoggerFilterWriterTest.java | 5 +-
>>> .../io/LoggerInputStreamCallerInfoTest.java | 9 +-
>>> .../logging/log4j/io/LoggerInputStreamTest.java | 13 +-
>>> .../io/LoggerOutputStreamCallerInfoTest.java | 6 +-
>>> .../log4j/io/LoggerOutputStreamTest.java | 4 +-
>>> .../io/LoggerPrintStreamCallerInfoTest.java | 12 +-
>>> .../logging/log4j/io/LoggerPrintStreamTest.java | 13 +-
>>> .../io/LoggerPrintWriterCallerInfoTest.java | 7 +-
>>> .../logging/log4j/io/LoggerPrintWriterTest.java | 11 +-
>>> .../log4j/io/LoggerReaderCallerInfoTest.java | 7 +-
>>> .../logging/log4j/io/LoggerReaderTest.java | 9 +-
>>> .../io/LoggerStreamsCallerInfoTesting.java | 8 +-
>>> .../logging/log4j/io/LoggerWriterTest.java | 4 +-
>>> 36 files changed, 418 insertions(+), 449 deletions(-)
>>> ----------------------------------------------------------------------
>>>
>>>
>>>
>>
>
>
> --
> Matt Sicker <bo...@gmail.com>
>
--
E-Mail: garydgregory@gmail.com | ggregory@apache.org
Java Persistence with Hibernate, Second Edition
<http://www.manning.com/bauer3/>
JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
Spring Batch in Action <http://www.manning.com/templier/>
Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory
Re: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by Matt Sicker <bo...@gmail.com>.
Does Eclipse give you the option to rebase and then push? If not, then I
think there's a git config option to auto-rebase when doing git pull.
n.b.: I use git on the command line for everything except for git commit.
On 4 September 2014 12:11, Remko Popma <re...@gmail.com> wrote:
> I noticed these emails are generated if I commit something locally and
> before I can push it, somebody else pushed their commit. Eclipse then gives
> me a warning and I do a pull before I can push my changes.
>
> However, this results in two emails: one for my original commit, and one
> like the below that to me seems like just noise (it just says that I merged
> from the remote repository into my local repository)...
>
> Am I doing something wrong?
> If Eclipse gives the warning that I cannot push because the remote
> repository has changed, should I rebase instead of pull or something?
>
>
> On Fri, Sep 5, 2014 at 2:02 AM, <rp...@apache.org> wrote:
>
>> Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
>>
>> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
>> Commit:
>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4b552d5d
>> Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4b552d5d
>> Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4b552d5d
>>
>> Branch: refs/heads/master
>> Commit: 4b552d5df02bcf1e208f4a2134d431ecb3d27051
>> Parents: e2c32ad 3faed6d
>> Author: rpopma <rp...@apache.org>
>> Authored: Fri Sep 5 02:01:16 2014 +0900
>> Committer: rpopma <rp...@apache.org>
>> Committed: Fri Sep 5 02:01:16 2014 +0900
>>
>> ----------------------------------------------------------------------
>> .../logging/log4j/io/ByteStreamLogger.java | 8 +-
>> .../logging/log4j/io/CharStreamLogger.java | 2 +-
>> .../log4j/io/IncompatibleLoggerException.java | 46 ++++
>> .../log4j/io/LoggerBufferedInputStream.java | 51 +---
>> .../logging/log4j/io/LoggerBufferedReader.java | 26 +-
>> .../log4j/io/LoggerFilterOutputStream.java | 25 +-
>> .../logging/log4j/io/LoggerFilterWriter.java | 14 +-
>> .../logging/log4j/io/LoggerInputStream.java | 23 +-
>> .../logging/log4j/io/LoggerOutputStream.java | 22 +-
>> .../logging/log4j/io/LoggerPrintStream.java | 79 +-----
>> .../logging/log4j/io/LoggerPrintWriter.java | 46 +---
>> .../apache/logging/log4j/io/LoggerReader.java | 17 +-
>> .../apache/logging/log4j/io/LoggerStreams.java | 267 +++++++++++--------
>> .../apache/logging/log4j/io/LoggerWriter.java | 12 +-
>> .../apache/logging/log4j/io/package-info.java | 20 ++
>> .../io/AbstractLoggerOutputStreamTest.java | 18 +-
>> .../log4j/io/AbstractLoggerWriterTest.java | 18 +-
>> .../logging/log4j/io/AbstractStreamTest.java | 19 +-
>> ...LoggerBufferedInputStreamCallerInfoTest.java | 12 +-
>> .../log4j/io/LoggerBufferedInputStreamTest.java | 6 +-
>> .../io/LoggerBufferedReaderCallerInfoTest.java | 10 +-
>> .../log4j/io/LoggerBufferedReaderTest.java | 13 +-
>> .../log4j/io/LoggerFilterOutputStreamTest.java | 5 +-
>> .../log4j/io/LoggerFilterWriterTest.java | 5 +-
>> .../io/LoggerInputStreamCallerInfoTest.java | 9 +-
>> .../logging/log4j/io/LoggerInputStreamTest.java | 13 +-
>> .../io/LoggerOutputStreamCallerInfoTest.java | 6 +-
>> .../log4j/io/LoggerOutputStreamTest.java | 4 +-
>> .../io/LoggerPrintStreamCallerInfoTest.java | 12 +-
>> .../logging/log4j/io/LoggerPrintStreamTest.java | 13 +-
>> .../io/LoggerPrintWriterCallerInfoTest.java | 7 +-
>> .../logging/log4j/io/LoggerPrintWriterTest.java | 11 +-
>> .../log4j/io/LoggerReaderCallerInfoTest.java | 7 +-
>> .../logging/log4j/io/LoggerReaderTest.java | 9 +-
>> .../io/LoggerStreamsCallerInfoTesting.java | 8 +-
>> .../logging/log4j/io/LoggerWriterTest.java | 4 +-
>> 36 files changed, 418 insertions(+), 449 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>>
>
--
Matt Sicker <bo...@gmail.com>
Re: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by Remko Popma <re...@gmail.com>.
I noticed these emails are generated if I commit something locally and
before I can push it, somebody else pushed their commit. Eclipse then gives
me a warning and I do a pull before I can push my changes.
However, this results in two emails: one for my original commit, and one
like the below that to me seems like just noise (it just says that I merged
from the remote repository into my local repository)...
Am I doing something wrong?
If Eclipse gives the warning that I cannot push because the remote
repository has changed, should I rebase instead of pull or something?
On Fri, Sep 5, 2014 at 2:02 AM, <rp...@apache.org> wrote:
> Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
>
> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4b552d5d
> Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4b552d5d
> Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4b552d5d
>
> Branch: refs/heads/master
> Commit: 4b552d5df02bcf1e208f4a2134d431ecb3d27051
> Parents: e2c32ad 3faed6d
> Author: rpopma <rp...@apache.org>
> Authored: Fri Sep 5 02:01:16 2014 +0900
> Committer: rpopma <rp...@apache.org>
> Committed: Fri Sep 5 02:01:16 2014 +0900
>
> ----------------------------------------------------------------------
> .../logging/log4j/io/ByteStreamLogger.java | 8 +-
> .../logging/log4j/io/CharStreamLogger.java | 2 +-
> .../log4j/io/IncompatibleLoggerException.java | 46 ++++
> .../log4j/io/LoggerBufferedInputStream.java | 51 +---
> .../logging/log4j/io/LoggerBufferedReader.java | 26 +-
> .../log4j/io/LoggerFilterOutputStream.java | 25 +-
> .../logging/log4j/io/LoggerFilterWriter.java | 14 +-
> .../logging/log4j/io/LoggerInputStream.java | 23 +-
> .../logging/log4j/io/LoggerOutputStream.java | 22 +-
> .../logging/log4j/io/LoggerPrintStream.java | 79 +-----
> .../logging/log4j/io/LoggerPrintWriter.java | 46 +---
> .../apache/logging/log4j/io/LoggerReader.java | 17 +-
> .../apache/logging/log4j/io/LoggerStreams.java | 267 +++++++++++--------
> .../apache/logging/log4j/io/LoggerWriter.java | 12 +-
> .../apache/logging/log4j/io/package-info.java | 20 ++
> .../io/AbstractLoggerOutputStreamTest.java | 18 +-
> .../log4j/io/AbstractLoggerWriterTest.java | 18 +-
> .../logging/log4j/io/AbstractStreamTest.java | 19 +-
> ...LoggerBufferedInputStreamCallerInfoTest.java | 12 +-
> .../log4j/io/LoggerBufferedInputStreamTest.java | 6 +-
> .../io/LoggerBufferedReaderCallerInfoTest.java | 10 +-
> .../log4j/io/LoggerBufferedReaderTest.java | 13 +-
> .../log4j/io/LoggerFilterOutputStreamTest.java | 5 +-
> .../log4j/io/LoggerFilterWriterTest.java | 5 +-
> .../io/LoggerInputStreamCallerInfoTest.java | 9 +-
> .../logging/log4j/io/LoggerInputStreamTest.java | 13 +-
> .../io/LoggerOutputStreamCallerInfoTest.java | 6 +-
> .../log4j/io/LoggerOutputStreamTest.java | 4 +-
> .../io/LoggerPrintStreamCallerInfoTest.java | 12 +-
> .../logging/log4j/io/LoggerPrintStreamTest.java | 13 +-
> .../io/LoggerPrintWriterCallerInfoTest.java | 7 +-
> .../logging/log4j/io/LoggerPrintWriterTest.java | 11 +-
> .../log4j/io/LoggerReaderCallerInfoTest.java | 7 +-
> .../logging/log4j/io/LoggerReaderTest.java | 9 +-
> .../io/LoggerStreamsCallerInfoTesting.java | 8 +-
> .../logging/log4j/io/LoggerWriterTest.java | 4 +-
> 36 files changed, 418 insertions(+), 449 deletions(-)
> ----------------------------------------------------------------------
>
>
>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by rp...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4b552d5d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4b552d5d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4b552d5d
Branch: refs/heads/master
Commit: 4b552d5df02bcf1e208f4a2134d431ecb3d27051
Parents: e2c32ad 3faed6d
Author: rpopma <rp...@apache.org>
Authored: Fri Sep 5 02:01:16 2014 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Sep 5 02:01:16 2014 +0900
----------------------------------------------------------------------
.../logging/log4j/io/ByteStreamLogger.java | 8 +-
.../logging/log4j/io/CharStreamLogger.java | 2 +-
.../log4j/io/IncompatibleLoggerException.java | 46 ++++
.../log4j/io/LoggerBufferedInputStream.java | 51 +---
.../logging/log4j/io/LoggerBufferedReader.java | 26 +-
.../log4j/io/LoggerFilterOutputStream.java | 25 +-
.../logging/log4j/io/LoggerFilterWriter.java | 14 +-
.../logging/log4j/io/LoggerInputStream.java | 23 +-
.../logging/log4j/io/LoggerOutputStream.java | 22 +-
.../logging/log4j/io/LoggerPrintStream.java | 79 +-----
.../logging/log4j/io/LoggerPrintWriter.java | 46 +---
.../apache/logging/log4j/io/LoggerReader.java | 17 +-
.../apache/logging/log4j/io/LoggerStreams.java | 267 +++++++++++--------
.../apache/logging/log4j/io/LoggerWriter.java | 12 +-
.../apache/logging/log4j/io/package-info.java | 20 ++
.../io/AbstractLoggerOutputStreamTest.java | 18 +-
.../log4j/io/AbstractLoggerWriterTest.java | 18 +-
.../logging/log4j/io/AbstractStreamTest.java | 19 +-
...LoggerBufferedInputStreamCallerInfoTest.java | 12 +-
.../log4j/io/LoggerBufferedInputStreamTest.java | 6 +-
.../io/LoggerBufferedReaderCallerInfoTest.java | 10 +-
.../log4j/io/LoggerBufferedReaderTest.java | 13 +-
.../log4j/io/LoggerFilterOutputStreamTest.java | 5 +-
.../log4j/io/LoggerFilterWriterTest.java | 5 +-
.../io/LoggerInputStreamCallerInfoTest.java | 9 +-
.../logging/log4j/io/LoggerInputStreamTest.java | 13 +-
.../io/LoggerOutputStreamCallerInfoTest.java | 6 +-
.../log4j/io/LoggerOutputStreamTest.java | 4 +-
.../io/LoggerPrintStreamCallerInfoTest.java | 12 +-
.../logging/log4j/io/LoggerPrintStreamTest.java | 13 +-
.../io/LoggerPrintWriterCallerInfoTest.java | 7 +-
.../logging/log4j/io/LoggerPrintWriterTest.java | 11 +-
.../log4j/io/LoggerReaderCallerInfoTest.java | 7 +-
.../logging/log4j/io/LoggerReaderTest.java | 9 +-
.../io/LoggerStreamsCallerInfoTesting.java | 8 +-
.../logging/log4j/io/LoggerWriterTest.java | 4 +-
36 files changed, 418 insertions(+), 449 deletions(-)
----------------------------------------------------------------------