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

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

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

2014-04-21 Thread ctubbsii
Merge branch '1.6.0-SNAPSHOT' Conflicts: server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/36a97ac0 Tree:

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

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

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

2014-03-27 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/8485134d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8485134d Diff:

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

2014-03-27 Thread ctubbsii
Merge branch '1.6.0-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[4/4] 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/4eb5237e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4eb5237e Diff:

[4/4] 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/fe5fc305 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fe5fc305 Diff:

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

2014-02-28 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/04d8cd8d Tree:

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

2014-02-28 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/07604ca0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/07604ca0 Diff:

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

2014-02-26 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/c5f80656 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c5f80656 Diff:

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

2014-02-25 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/08f0b9ac Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/08f0b9ac Diff:

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

2014-02-18 Thread ecn
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

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

2014-01-28 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/8681f07c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8681f07c Diff:

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

2014-01-28 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/b8f2b72c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b8f2b72c Diff:

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

2014-01-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/77568bc3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/77568bc3 Diff:

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

2014-01-16 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/3f21e5d9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3f21e5d9 Diff:

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

2014-01-13 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/4cffb74a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4cffb74a Diff:

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

2014-01-09 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/dc10e22d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc10e22d Diff:

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

2014-01-08 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/9b547531 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b547531 Diff:

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

2014-01-03 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/86a26fe6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/86a26fe6 Diff:

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

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

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

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

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

2014-01-02 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/1bd9abcd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1bd9abcd Diff:

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

2013-12-12 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/c8c84be2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8c84be2 Diff:

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

2013-12-06 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/0bec52b5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0bec52b5 Diff:

[4/4] 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/cf309e54 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf309e54 Diff:

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

2013-12-02 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/ccec95b6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ccec95b6 Diff:

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

2013-11-27 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/378a9f1d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/378a9f1d Diff:

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

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

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

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

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

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

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

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

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

2013-11-13 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/209cc076 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/209cc076 Diff:

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

2013-11-08 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/4d690b1e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d690b1e Diff: