[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: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca2d4e

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

2014-04-07 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/1b4c49c6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1b4c49c6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1b4c49

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

2014-04-04 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/bdc2a994 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bdc2a994 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bdc2a9

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

2014-04-04 Thread vines
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/676e30cd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/676e30cd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/676e30

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

2014-04-04 Thread ctubbsii
Merge branch '1.6.0-SNAPSHOT' Conflicts: conf/examples/1GB/native-standalone/accumulo-env.sh conf/examples/2GB/native-standalone/accumulo-env.sh conf/examples/2GB/standalone/accumulo-env.sh conf/examples/3GB/native-standalone/accumulo-env.sh conf/examples/3G

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

2014-03-25 Thread ecn
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/b40ce8e5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b40ce8e5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b40ce8

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

2014-03-24 Thread elserj
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/a9f1767b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a9f1767b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a9f176

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

2014-03-21 Thread ecn
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: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2bf27adf Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2

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

2014-03-14 Thread ecn
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/ea076646 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ea076646 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ea0766

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

2014-03-05 Thread ecn
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/9c82498e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9c82498e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9c8249

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

2014-02-20 Thread ecn
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/8d9d404f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8d9d404f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8d9d40

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

2014-02-18 Thread ecn
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/9a2ac766 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9a2ac766 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9a2ac7

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

2014-02-18 Thread ecn
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/3043c220 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3043c220 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3043c2

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

2014-02-13 Thread elserj
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/e716e496 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e716e496 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e716e4

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

2014-01-23 Thread kturner
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/9496199d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9496199d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/949619

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

2014-01-10 Thread elserj
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/af151d69 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af151d69 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af151d

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

2013-12-19 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b59c2687 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b

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

2013-12-17 Thread ecn
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/568f3ddb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/568f3ddb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/568f3d

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

2013-12-12 Thread ecn
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: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e8f1a9ed Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e

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

2013-12-05 Thread elserj
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/fd0ff920 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd0ff920 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd0ff9

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

2013-12-05 Thread elserj
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/7d5430f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d5430f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d5430

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

2013-12-03 Thread elserj
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/5b84dc2a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5b84dc2a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5b84dc

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

2013-11-26 Thread ecn
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: http://git-wip-us.apache.org/repos/asf/accumulo/commit/54f737f2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5

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

2013-11-14 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/da199d9c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da199d9c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/da199d