Merge branch '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/39e09cbc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/39e09cbc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/39e09cbc Branch: refs/heads/master Commit: 39e09cbc02cd8f7eb35d8f151aae7b1cfc642350 Parents: 8291b6c 55b17e4 Author: Mike Drob <md...@cloudera.com> Authored: Tue Mar 25 15:56:16 2014 -0400 Committer: Mike Drob <md...@cloudera.com> Committed: Tue Mar 25 15:56:16 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/util/format/DateStringFormatter.java | 6 ++++++ .../accumulo/core/util/format/DateStringFormatterTest.java | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
