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

2014-04-23 Thread mdrob
Merge branch '1.5.2-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/9c049a28 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9c049a28 Diff: http://git-wip-us.apache.org/repos/asf/

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

2014-04-10 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Project: http://git-wip-us.apache.org/repos/asf/accumulo

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

2014-04-04 Thread elserj
Merge branch '1.5.2-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/6831e127 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6831e127 Diff: http://git-wip-us.apache.org/repos/asf/

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

2014-04-04 Thread mdrob
Merge branch '1.5.2-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/b6dee7fb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b6dee7fb Diff: http://git-wip-us.apache.org/repos/asf/

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

2014-04-04 Thread elserj
Merge branch '1.5.2-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/69605702 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/69605702 Diff: http://git-wip-us.apache.org/repos/asf/

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

2014-04-03 Thread mdrob
Merge branch '1.5.2-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/b3f6e0f8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b3f6e0f8 Diff: http://git-wip-us.apache.org/repos/asf/

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

2014-04-01 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Project: http://git-wip-us.apache.org/repos/asf/accumulo

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

2014-03-27 Thread busbey
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8572fe5 Tree: h

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

2014-03-24 Thread busbey
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: README Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d9852eb5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d9852eb5 Diff: http://git-w

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

2014-03-24 Thread busbey
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: README Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/04d51b3b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04d51b3b Diff: http://git-w

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

2014-03-21 Thread elserj
Merge branch '1.5.2-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/3ce79a97 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ce79a97 Diff: http://git-wip-us.apache.org/repos/asf/

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

2014-03-20 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ef5dc4a1 Tree: http

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

2014-03-18 Thread busbey
Merge branch '1.5.2-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/4d873512 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d873512 Diff: http://git-wip-us.apache.org/repos/asf/

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

2014-03-13 Thread bhavanki
Merge branch '1.5.2-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/ec36ce07 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec36ce07 Diff: http://git-wip-us.apache.org/repos/asf/

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

2014-03-10 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fb17d458 Tree: http://git-wip-us.apach

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

2014-03-09 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/master/Master.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a63e7c9b Tree: http://git-wip-us.ap

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

2014-03-07 Thread bhavanki
Merge branch '1.5.2-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/a4e56260 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a4e56260 Diff: http://git-wip-us.apache.org/repos/asf/

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

2014-03-05 Thread kturner
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/80febfa6 Tree: http://git-wip-us.