Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c3d5c1f4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c3d5c1f4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c3d5c1f4 Branch: refs/heads/master Commit: c3d5c1f470da1dc4ac6f811d3b081f3f9aa8d770 Parents: caf1ffb 37f117c Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Jan 9 14:23:07 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Jan 9 14:23:07 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/constraints/Constraint.java | 76 ++++++++++++++------ .../accumulo/core/constraints/Violations.java | 32 +++++++++ .../core/data/ConstraintViolationSummary.java | 9 +-- 3 files changed, 90 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
