Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/45b7e295 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/45b7e295 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/45b7e295 Branch: refs/heads/ACCUMULO-378 Commit: 45b7e29577d4dba24374128403ad99e6d32ee40b Parents: 0356387 53ec689 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Tue Jun 10 16:53:54 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Tue Jun 10 16:53:54 2014 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/core/cli/BatchWriterOpts.java | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------