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

2014-03-26 Thread busbey
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-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/1140d007 Tree: http://git-wip-us.apache.org/re

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

2014-03-21 Thread bhavanki
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Conflicts: test/system/auto/README.md test/system/bench/README test/system/continuous/README test/system/scalability/README.md test/system/test1/README test/system/test2/README test/system/tes

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

2014-03-20 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-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/63d5e55a Tree: htt

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

2014-03-20 Thread bhavanki
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Conflicts: test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropUser.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4b7a011c Tree: http://g

[06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours)

2014-03-18 Thread bhavanki
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/53f2e345 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/53f2e345 Diff: http://git-wip-us.apache.org/r

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

2014-03-18 Thread bhavanki
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f4cb4d5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f4cb4d5 Diff: http://git-wip-us.apache.org/repos/asf/

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

2014-03-13 Thread bhavanki
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Conflicts: src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityFixture.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/585

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

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

[06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours)

2014-03-11 Thread bhavanki
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/19231a25 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/19231a25 Diff: http://git-wip-us.apache.org/r

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

2014-03-04 Thread mdrob
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d9e1557 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d9e1557 Diff: http://git-wip-us.apache.org/repos/asf/