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

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

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

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

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

2014-03-27 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6430933a Tree: http://git-wip-us.apac

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

2014-03-26 Thread busbey
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: start/src/main/java/org/apache/accumulo/start/Main.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a5a05523 Tree: http://git-wip-us.apache.org/re

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

2014-03-21 Thread bhavanki
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/system/auto/README.md Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/341e60b8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/341e60b

[08/10] 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: minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/44b13c12 Tree: htt

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

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

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

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

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

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

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

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

2014-03-12 Thread bhavanki
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7ed250ab Tr

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

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

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

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