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/7d5430f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d5430f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d5430f6 Branch: refs/heads/master Commit: 7d5430f6ea054c5f98e45750494225f2581fb167 Parents: 2f53bc9 f0c12cd Author: Josh Elser <els...@apache.org> Authored: Thu Dec 5 12:34:28 2013 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Dec 5 12:34:28 2013 -0500 ---------------------------------------------------------------------- .../apache/accumulo/examples/simple/filedata/FileDataIngest.java | 2 +- .../apache/accumulo/examples/simple/filedata/FileDataQuery.java | 2 +- server/monitor/src/main/resources/docs/examples/README.filedata | 4 ++-- server/native/src/main/resources/Makefile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
