You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by el...@apache.org on 2014/09/19 21:00:10 UTC

[13/15] git commit: Merge remote-tracking branch 'origin/1.6.1-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge remote-tracking branch 'origin/1.6.1-SNAPSHOT' into 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/3c6876d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c6876d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c6876d1

Branch: refs/heads/master
Commit: 3c6876d1415081a0eac73e41503863cb68b2dfd8
Parents: 984ba22 287e4a6
Author: Josh Elser <el...@apache.org>
Authored: Fri Sep 19 14:35:15 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Sep 19 14:35:15 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/monitor/servlets/ScanServlet.java | 2 +-
 .../main/java/org/apache/accumulo/tserver/TabletServer.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------