Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d7c50d1f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d7c50d1f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d7c50d1f Branch: refs/heads/master Commit: d7c50d1fd16334c6c42d90c3241c1751b2d9529e Parents: def8f90 40d5a72 Author: Josh Elser <els...@apache.org> Authored: Fri Aug 26 13:24:39 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Aug 26 13:24:39 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/master/replication/WorkMaker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d7c50d1f/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java ---------------------------------------------------------------------- diff --cc server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java index 6c5645d,e8c3ca7..bd9bd65 --- a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java +++ b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java @@@ -93,8 -93,8 +93,8 @@@ public class WorkMaker for (Entry<Key,Value> entry : s) { // Extract the useful bits from the status key ReplicationSchema.StatusSection.getFile(entry.getKey(), file); - ReplicationSchema.StatusSection.getTableId(entry.getKey(), tableId); + String tableId = ReplicationSchema.StatusSection.getTableId(entry.getKey()); - log.info("Processing replication status record for " + file + " on table " + tableId); + log.debug("Processing replication status record for " + file + " on table " + tableId); Status status; try {
