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

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/1bcc62af Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1bcc62af Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1bcc62

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/system/auto/stress/restart.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bff86684 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree

[3/6] git commit: ACCUMULO-2264 Up the walog max size so it doesn't break by default on hadoop2

ACCUMULO-2264 Up the walog max size so it doesn't break by default on hadoop2 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ffd72325 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ffd72325 Diff: http://git-

[1/6] git commit: ACCUMULO-2264 Up the walog max size so it doesn't break by default on hadoop2

Updated Branches: refs/heads/1.5.1-SNAPSHOT 44ff6b0dd -> ffd72325e refs/heads/1.6.0-SNAPSHOT f67603f9c -> bff866845 refs/heads/master 3132b0121 -> 1bcc62af3 ACCUMULO-2264 Up the walog max size so it doesn't break by default on hadoop2 Project: http://git-wip-us.apache.org/repos/asf/accumu

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/system/auto/stress/restart.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bff86684 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree

[2/6] git commit: ACCUMULO-2264 Up the walog max size so it doesn't break by default on hadoop2

ACCUMULO-2264 Up the walog max size so it doesn't break by default on hadoop2 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ffd72325 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ffd72325 Diff: http://git-

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

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/3132b012 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3132b012 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3132b0

[03/10] git commit: ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes

ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cabe14a1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cabe14a1 Diff: http://git-wi

[04/10] git commit: ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes

ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cabe14a1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cabe14a1 Diff: http://git-wi

[01/10] git commit: ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes

Updated Branches: refs/heads/1.4.5-SNAPSHOT 6593a9f54 -> cabe14a15 refs/heads/1.5.1-SNAPSHOT 295643ab0 -> 44ff6b0dd refs/heads/1.6.0-SNAPSHOT 19da920aa -> f67603f9c refs/heads/master 0524ddbfb -> 3132b0121 ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes Proje

[06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: conf/examples/1GB/native-standalone/accumulo-env.sh conf/examples/1GB/standalone/accumulo-env.sh conf/examples/2GB/native-standalone/accumulo-env.sh conf/examples/2GB/standalone/accumulo-env.sh con

[05/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: conf/examples/1GB/native-standalone/accumulo-env.sh conf/examples/1GB/standalone/accumulo-env.sh conf/examples/2GB/native-standalone/accumulo-env.sh conf/examples/2GB/standalone/accumulo-env.sh con

[09/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 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/f67603f9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f67603f9 Diff: http://git-wip-us.apache.org/repos/asf/

[07/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: conf/examples/1GB/native-standalone/accumulo-env.sh conf/examples/1GB/standalone/accumulo-env.sh conf/examples/2GB/native-standalone/accumulo-env.sh conf/examples/2GB/standalone/accumulo-env.sh con

[02/10] git commit: ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes

ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cabe14a1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cabe14a1 Diff: http://git-wi

[08/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 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/f67603f9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f67603f9 Diff: http://git-wip-us.apache.org/repos/asf/