Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 23D9A1011B for ; Mon, 3 Feb 2014 22:39:04 +0000 (UTC) Received: (qmail 61358 invoked by uid 500); 3 Feb 2014 22:38:56 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 61239 invoked by uid 500); 3 Feb 2014 22:38:53 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 61188 invoked by uid 99); 3 Feb 2014 22:38:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Feb 2014 22:38:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8644E918B92; Mon, 3 Feb 2014 22:38:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhavanki@apache.org To: commits@accumulo.apache.org Date: Mon, 03 Feb 2014 22:38:54 -0000 Message-Id: <2d4711be1cc34a48bbd4f01748fff432@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/12] git commit: ACCUMULO-2314 Fix nit typographical/grammar issues. ACCUMULO-2314 Fix nit typographical/grammar issues. Signed-off-by: Bill Havanki Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f11eb1db Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f11eb1db Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f11eb1db Branch: refs/heads/1.5.1-SNAPSHOT Commit: f11eb1db95ef032780609442476f429827d45fb6 Parents: 748276b Author: Alex Moundalexis Authored: Mon Feb 3 14:58:14 2014 -0500 Committer: Bill Havanki Committed: Mon Feb 3 17:35:02 2014 -0500 ---------------------------------------------------------------------- bin/config.sh | 2 +- .../main/java/org/apache/accumulo/server/logger/LogWriter.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f11eb1db/bin/config.sh ---------------------------------------------------------------------- diff --git a/bin/config.sh b/bin/config.sh index 665777e..12f2096 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -28,7 +28,7 @@ # HADOOP_HOME Home dir for hadoop. # MONITOR Machine to run monitor daemon on. Used by start-here.sh script # -# Iff ACCUMULO_VERIFY_ONLY is not set, this script will +# If and only if ACCUMULO_VERIFY_ONLY is not set, this script will # * Check for standalone mode (lack of masters and slaves files) # - Do appropriate set up # * Ensure the existence of ACCUMULO_LOG_DIR on the current host http://git-wip-us.apache.org/repos/asf/accumulo/blob/f11eb1db/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java ---------------------------------------------------------------------- diff --git a/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java b/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java index a8bc87c..53104ef 100644 --- a/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java +++ b/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java @@ -287,7 +287,7 @@ class LogWriter implements MutationLogger.Iface { FileSystem local = TraceFileSystem.wrap(FileSystem.getLocal(fs.getConf()).getRaw()); Path dest = new Path(fullyQualifiedFileName + ".recovered"); - log.debug("Sorting log file to DSF " + dest); + log.debug("Sorting log file to DFS " + dest); fs.mkdirs(dest); int part = 0; @@ -325,7 +325,7 @@ class LogWriter implements MutationLogger.Iface { private void writeSortedEntries(Path dest, int part, final List> kv) throws IOException { String path = dest + String.format("/part-r-%05d", part); - log.debug("Writing partial log file to DSF " + path); + log.debug("Writing partial log file to DFS " + path); log.debug("Sorting"); Span span = Trace.start("Logger sort"); span.data("logfile", dest.getName()); @@ -353,7 +353,7 @@ class LogWriter implements MutationLogger.Iface { private void copyLog(final String localLog, final String fullyQualifiedFileName) throws IOException { Path dest = new Path(fullyQualifiedFileName + ".copy"); - log.debug("Copying log file to DSF " + dest); + log.debug("Copying log file to DFS " + dest); fs.delete(dest, true); LogFileKey key = new LogFileKey(); LogFileValue value = new LogFileValue();