git commit: ACCUMULO-2671 adjusting test to make jenkins happy

2014-04-18 Thread vines
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 8d6432bec - 055072064 ACCUMULO-2671 adjusting test to make jenkins happy Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/05507206 Tree:

[2/6] git commit: ACCUMULO-2671 Refactoring BlockedOutputStream to not recurse. With test

2014-04-18 Thread vines
ACCUMULO-2671 Refactoring BlockedOutputStream to not recurse. With test Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/17344890 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17344890 Diff:

[5/6] git commit: ACCUMULO-2671 adjusting test to make jenkins happy

2014-04-18 Thread vines
ACCUMULO-2671 adjusting test to make jenkins happy Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/05507206 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/05507206 Diff:

[3/6] git commit: ACCUMULO-2690 fixing output stream short circuiting in walog

2014-04-18 Thread vines
ACCUMULO-2690 fixing output stream short circuiting in walog Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8e3dc7b4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8e3dc7b4 Diff:

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-04-18 Thread vines
Merge branch '1.6.0-SNAPSHOT' Conflicts: core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/94008f6a Tree:

[1/6] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

2014-04-18 Thread vines
Repository: accumulo Updated Branches: refs/heads/master 8aedbe6ca - 94008f6a1 Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[4/6] git commit: ACCUMULO-2690 expanding test to validate giant read as well

2014-04-18 Thread vines
ACCUMULO-2690 expanding test to validate giant read as well Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8d6432be Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8d6432be Diff:

[9/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-04-18 Thread ctubbsii
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1645b4f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1645b4f6 Diff:

[6/9] git commit: ACCUMULO-2529 Show compiler warnings in maven build

2014-04-18 Thread ctubbsii
ACCUMULO-2529 Show compiler warnings in maven build Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3648c1bd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3648c1bd Diff:

[5/9] git commit: ACCUMULO-2529 Show compiler warnings in maven build

2014-04-18 Thread ctubbsii
ACCUMULO-2529 Show compiler warnings in maven build Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3648c1bd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3648c1bd Diff:

[8/9] git commit: Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-04-18 Thread ctubbsii
Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT Conflicts: pom.xml src/core/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0aa1d039 Tree:

[4/5] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-04-18 Thread ctubbsii
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1645b4f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1645b4f6 Diff:

[1/5] git commit: ACCUMULO-2625 Remove build warnings for 1.4

2014-04-18 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/master 94008f6a1 - ca2d4ebd9 ACCUMULO-2625 Remove build warnings for 1.4 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d53f2e5 Tree:

[3/9] git commit: ACCUMULO-2625 Remove build warnings for 1.4

2014-04-18 Thread ctubbsii
ACCUMULO-2625 Remove build warnings for 1.4 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d53f2e5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d53f2e5 Diff:

[1/9] git commit: ACCUMULO-2625 Remove build warnings for 1.4

2014-04-18 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.4.6-SNAPSHOT 7461ed924 - 3648c1bd3 refs/heads/1.5.2-SNAPSHOT 708ad54ec - 0aa1d039e refs/heads/1.6.0-SNAPSHOT 055072064 - 1645b4f62 ACCUMULO-2625 Remove build warnings for 1.4 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo

[2/5] git commit: ACCUMULO-2529 Show compiler warnings in maven build

2014-04-18 Thread ctubbsii
ACCUMULO-2529 Show compiler warnings in maven build Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3648c1bd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3648c1bd Diff:

[5/5] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-04-18 Thread ctubbsii
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ca2d4ebd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca2d4ebd Diff:

[7/9] git commit: Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-04-18 Thread ctubbsii
Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT Conflicts: pom.xml src/core/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0aa1d039 Tree:

[1/2] git commit: ACCUMULO-2695 Fixed Conditional writer hang caused by tablet server fault

2014-04-18 Thread kturner
Repository: accumulo Updated Branches: refs/heads/master ca2d4ebd9 - 5abb916fc ACCUMULO-2695 Fixed Conditional writer hang caused by tablet server fault This change fixes issues that occurred when the conditional writer got an exception when trying to connect to a tserver. The conditonal

git commit: ACCUMULO-2686 Label classes with correct @since tag

2014-04-18 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 0f3b4ca0a - b383cc571 ACCUMULO-2686 Label classes with correct @since tag Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b383cc57 Tree:

[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-04-18 Thread ctubbsii
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3086472f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3086472f Diff:

[1/2] git commit: ACCUMULO-2686 Label classes with correct @since tag

2014-04-18 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/master 5abb916fc - 3086472f4 ACCUMULO-2686 Label classes with correct @since tag Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b383cc57 Tree: