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/8127f2d7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8127f2d7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8127f2d7 Branch: refs/heads/master Commit: 8127f2d76e70e4ed875fcec437f6a025030adcdb Parents: d7827e0 ffae5cc Author: Keith Turner <ktur...@apache.org> Authored: Wed Mar 5 20:25:47 2014 -0500 Committer: Keith Turner <ktur...@apache.org> Committed: Wed Mar 5 20:25:47 2014 -0500 ---------------------------------------------------------------------- .../japi-compliance/japi-accumulo-1.4.xml | 34 ------------------ .../japi-compliance/japi-accumulo-1.5.xml | 6 ++-- .../japi-compliance/japi-accumulo-1.6.xml | 38 ++++++++++++++++++++ 3 files changed, 42 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
