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/9035be17 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9035be17 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9035be17 Branch: refs/heads/master Commit: 9035be1773f6d61a353c62f489e64db5e9ed2038 Parents: 810dbd1 534b0e7 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Apr 10 13:37:29 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Apr 10 13:37:29 2014 -0400 ---------------------------------------------------------------------- docs/pom.xml | 1 + pom.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9035be17/docs/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9035be17/pom.xml ----------------------------------------------------------------------