Merge branch '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/4b99e946 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4b99e946 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4b99e946 Branch: refs/heads/master Commit: 4b99e946050c2d465851022dc15e7021335daa6f Parents: 7e01de5 c86b067 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Jun 19 11:54:49 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jun 19 11:54:49 2014 -0400 ---------------------------------------------------------------------- .gitignore | 19 ++++++++++--------- assemble/.gitignore | 25 +++++++++++++++++++++++++ core/.gitignore | 25 +++++++++++++++++++++++++ docs/.gitignore | 25 +++++++++++++++++++++++++ examples/simple/.gitignore | 25 +++++++++++++++++++++++++ fate/.gitignore | 25 +++++++++++++++++++++++++ maven-plugin/.gitignore | 25 +++++++++++++++++++++++++ minicluster/.gitignore | 25 +++++++++++++++++++++++++ proxy/.gitignore | 28 ++++++++++++++++++++++++++++ server/base/.gitignore | 25 +++++++++++++++++++++++++ server/gc/.gitignore | 25 +++++++++++++++++++++++++ server/master/.gitignore | 25 +++++++++++++++++++++++++ server/monitor/.gitignore | 25 +++++++++++++++++++++++++ server/native/.gitignore | 25 +++++++++++++++++++++++++ server/tracer/.gitignore | 25 +++++++++++++++++++++++++ server/tserver/.gitignore | 25 +++++++++++++++++++++++++ start/.gitignore | 25 +++++++++++++++++++++++++ test/.gitignore | 28 ++++++++++++++++++++++++++++ trace/.gitignore | 25 +++++++++++++++++++++++++ 19 files changed, 466 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
