Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Conflicts:
src/assemble/build.sh
test/system/auto/simple/__init__.py
test/system/auto/stress/__init__.py
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e6748a8d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e6748a8d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e6748a8d
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: e6748a8dc6be8dd7b398ff3e29715f125756dbbc
Parents: 70e50f3 edfbd2f
Author: Mike Drob <md...@cloudera.com>
Authored: Mon Mar 24 22:51:27 2014 -0400
Committer: Mike Drob <md...@cloudera.com>
Committed: Mon Mar 24 22:51:27 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
