Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a03f14a5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a03f14a5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a03f14a5 Branch: refs/heads/master Commit: a03f14a5cafb0dd2929d84a92766d223a0429e51 Parents: ae4fd48 4d1acd1 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Apr 30 13:43:16 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Apr 30 13:43:16 2015 -0400 ---------------------------------------------------------------------- core/src/main/scripts/generate-thrift.sh | 6 +++--- pom.xml | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a03f14a5/pom.xml ----------------------------------------------------------------------
