Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d06a9ef7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d06a9ef7
Diff: http://git-wip-us.apache.org/r
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateUser.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c42a511a
Tree: http:/
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileAttributes.java
test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java
The conflict for HdfsFileAttributes ab
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExecfileCommand.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/56230eb9
Tree: h