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 6D52310688 for ; Wed, 20 Nov 2013 23:25:12 +0000 (UTC) Received: (qmail 72888 invoked by uid 500); 20 Nov 2013 23:25:12 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 72861 invoked by uid 500); 20 Nov 2013 23:25:12 -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 72854 invoked by uid 99); 20 Nov 2013 23:25:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Nov 2013 23:25:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 13BD0885E33; Wed, 20 Nov 2013 23:25:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Message-Id: <402dca1e83504063baac5a94850cda2e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: ACCUMULO-1000 Some spelling/grammar corrections. Date: Wed, 20 Nov 2013 23:25:12 +0000 (UTC) Updated Branches: refs/heads/1.6.0-SNAPSHOT 211ca036c -> 42853c14a ACCUMULO-1000 Some spelling/grammar corrections. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/42853c14 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/42853c14 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/42853c14 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 42853c14aa7e46328272d4c91e0afe3ab938a27b Parents: 211ca03 Author: Josh Elser Authored: Wed Nov 20 18:24:20 2013 -0500 Committer: Josh Elser Committed: Wed Nov 20 18:24:20 2013 -0500 ---------------------------------------------------------------------- .../src/main/resources/docs/examples/README.reservations | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/42853c14/server/monitor/src/main/resources/docs/examples/README.reservations ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/resources/docs/examples/README.reservations b/server/monitor/src/main/resources/docs/examples/README.reservations index 7ad9cd3..a966ed9 100644 --- a/server/monitor/src/main/resources/docs/examples/README.reservations +++ b/server/monitor/src/main/resources/docs/examples/README.reservations @@ -17,9 +17,9 @@ Notice: Licensed to the Apache Software Foundation (ASF) under one under the License. This example shows running a simple reservation system implemented using -conditional mutations. This system garuntees that only one concurrent user can +conditional mutations. This system guarantees that only one concurrent user can reserve a resource. The example's reserve command allows multiple users to be -specified. When this is done it creates a separate reservation thread for each +specified. When this is done, it creates a separate reservation thread for each user. In the example below threads are spun up for alice, bob, eve, mallory, and trent to reserve room06 on 20140101. Bob ends up getting the reservation and everyone else is put on a wait list. The example code will take any string @@ -60,7 +60,7 @@ following: room06:20140101 tx:seq [] 6 The tx:seq column is incremented for each update to the row allowing for -detection of concurrent changes. For an update to go through the sequence -number must not have changed since the data was read. If it does change then +detection of concurrent changes. For an update to go through, the sequence +number must not have changed since the data was read. If it does change, the conditional mutation will fail and the example code will retry.