You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by br...@apache.org on 2018/07/10 11:29:27 UTC
zookeeper git commit: ZOOKEEPER-3073: fix couple of typos
Repository: zookeeper
Updated Branches:
refs/heads/master 32e4a1676 -> 5fdd70ac4
ZOOKEEPER-3073: fix couple of typos
Author: Christine Poerschke <cp...@bloomberg.net>
Reviewers: Norbert Kalmar <nk...@cloudera.com>, 毛蛤丝 <ma...@sina.com>, Benjamin Reed <br...@apache.org>
Closes #554 from cpoerschke/master-ZOOKEEPER-3073
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/5fdd70ac
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/5fdd70ac
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/5fdd70ac
Branch: refs/heads/master
Commit: 5fdd70ac49c7a5334bdcae309719ac4ada352dde
Parents: 32e4a16
Author: Christine Poerschke <cp...@bloomberg.net>
Authored: Tue Jul 10 04:29:20 2018 -0700
Committer: benjamin reed <br...@apache.org>
Committed: Tue Jul 10 04:29:20 2018 -0700
----------------------------------------------------------------------
docs/releasenotes.html | 4 ++--
src/c/acinclude.m4 | 2 +-
src/java/main/org/apache/jute/OutputArchive.java | 2 +-
src/java/main/org/apache/zookeeper/ClientCnxnSocket.java | 2 +-
src/java/main/org/apache/zookeeper/cli/DelQuotaCommand.java | 2 +-
src/java/main/org/apache/zookeeper/server/DataTree.java | 2 +-
.../org/apache/zookeeper/test/system/QuorumPeerInstance.java | 2 +-
src/java/test/org/apache/zookeeper/test/LoadFromLogTest.java | 2 +-
.../test/org/apache/zookeeper/test/MultiTransactionTest.java | 4 ++--
src/recipes/lock/src/c/acinclude.m4 | 2 +-
src/recipes/queue/src/c/acinclude.m4 | 2 +-
11 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/5fdd70ac/docs/releasenotes.html
----------------------------------------------------------------------
diff --git a/docs/releasenotes.html b/docs/releasenotes.html
index 08cb0cd..63a341a 100644
--- a/docs/releasenotes.html
+++ b/docs/releasenotes.html
@@ -300,11 +300,11 @@ Note: ZooKeeper increments the major version number (major.minor.fix) when backw
<h4>Watch Management</h4>
<p>
In previous releases of ZooKeeper any watches registered by clients were lost if the client lost a connection to a ZooKeeper server.
-This meant that developers had to track watches they were interested in and reregister them if a session disconnect event was recieved.
+This meant that developers had to track watches they were interested in and reregister them if a session disconnect event was received.
In this release the client library tracks watches that a client has registered and reregisters the watches when a connection is made to a new server.
Applications that still manually reregister interest should continue working properly as long as they are able to handle unsolicited watches.
For example, an old application may register a watch for /foo and /goo, lose the connection, and reregister only /goo.
-As long as the application is able to recieve a notification for /foo, (probably ignoring it) it does not need to be changed.
+As long as the application is able to receive a notification for /foo, (probably ignoring it) it does not need to be changed.
One caveat to the watch management: it is possible to miss an event for the creation and deletion of a znode if watching for creation and both the create and delete happens while the client is disconnected from ZooKeeper.
</p>
<p>
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/5fdd70ac/src/c/acinclude.m4
----------------------------------------------------------------------
diff --git a/src/c/acinclude.m4 b/src/c/acinclude.m4
index d0041d8..a4d405a 100644
--- a/src/c/acinclude.m4
+++ b/src/c/acinclude.m4
@@ -7,7 +7,7 @@
# aminclude.m4 file and a compatible doxygen configuration file. Defines the
# following public macros:
#
-# DX_???_FEATURE(ON|OFF) - control the default setting fo a Doxygen feature.
+# DX_???_FEATURE(ON|OFF) - control the default setting of a Doxygen feature.
# Supported features are 'DOXYGEN' itself, 'DOT' for generating graphics,
# 'HTML' for plain HTML, 'CHM' for compressed HTML help (for MS users), 'CHI'
# for generating a seperate .chi file by the .chm file, and 'MAN', 'RTF',
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/5fdd70ac/src/java/main/org/apache/jute/OutputArchive.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/jute/OutputArchive.java b/src/java/main/org/apache/jute/OutputArchive.java
index f53b123..5f78ea9 100644
--- a/src/java/main/org/apache/jute/OutputArchive.java
+++ b/src/java/main/org/apache/jute/OutputArchive.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.TreeMap;
/**
- * Interface that alll the serializers have to implement.
+ * Interface that all the serializers have to implement.
*
*/
public interface OutputArchive {
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/5fdd70ac/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java b/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java
index 0e5316d..c2357cb 100644
--- a/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java
+++ b/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java
@@ -118,7 +118,7 @@ abstract class ClientCnxnSocket {
protected void readLength() throws IOException {
int len = incomingBuffer.getInt();
if (len < 0 || len >= packetLen) {
- throw new IOException("Packet len" + len + " is out of range!");
+ throw new IOException("Packet len " + len + " is out of range!");
}
incomingBuffer = ByteBuffer.allocate(len);
}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/5fdd70ac/src/java/main/org/apache/zookeeper/cli/DelQuotaCommand.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/cli/DelQuotaCommand.java b/src/java/main/org/apache/zookeeper/cli/DelQuotaCommand.java
index 8005406..c5ed403 100644
--- a/src/java/main/org/apache/zookeeper/cli/DelQuotaCommand.java
+++ b/src/java/main/org/apache/zookeeper/cli/DelQuotaCommand.java
@@ -63,7 +63,7 @@ public class DelQuotaCommand extends CliCommand {
@Override
public boolean exec() throws CliException {
//if neither option -n or -b is specified, we delete
- // the quota node for thsi node.
+ // the quota node for this node.
String path = args[1];
try {
if (cl.hasOption("b")) {
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/5fdd70ac/src/java/main/org/apache/zookeeper/server/DataTree.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/DataTree.java b/src/java/main/org/apache/zookeeper/server/DataTree.java
index d5e5fa9..eb4b7d6 100644
--- a/src/java/main/org/apache/zookeeper/server/DataTree.java
+++ b/src/java/main/org/apache/zookeeper/server/DataTree.java
@@ -120,7 +120,7 @@ public class DataTree {
.substring(procZookeeper.length() + 1);
/**
- * the path trie that keeps track fo the quota nodes in this datatree
+ * the path trie that keeps track of the quota nodes in this datatree
*/
private final PathTrie pTrie = new PathTrie();
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/5fdd70ac/src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java
----------------------------------------------------------------------
diff --git a/src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java b/src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java
index 2591a24..fdeb2b9 100644
--- a/src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java
+++ b/src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java
@@ -275,7 +275,7 @@ class QuorumPeerInstance implements Instance {
/**
* Stop an instance of the quorumPeer
* @param im the manager of the instance
- * @param index the zero based index fo the server to stop
+ * @param index the zero based index of the server to stop
* @throws InterruptedException
* @throws KeeperException
* @throws NoAssignmentException
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/5fdd70ac/src/java/test/org/apache/zookeeper/test/LoadFromLogTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/test/LoadFromLogTest.java b/src/java/test/org/apache/zookeeper/test/LoadFromLogTest.java
index 90de755..8303e55 100644
--- a/src/java/test/org/apache/zookeeper/test/LoadFromLogTest.java
+++ b/src/java/test/org/apache/zookeeper/test/LoadFromLogTest.java
@@ -91,7 +91,7 @@ public class LoadFromLogTest extends ClientBase {
hdr = itr.getHeader();
expectedZxid++;
Assert.assertTrue("not the same transaction. lastZxid=" + lastZxid + ", zxid=" + hdr.getZxid(), lastZxid != hdr.getZxid());
- Assert.assertTrue("excepting next transaction. expected=" + expectedZxid + ", retreived=" + hdr.getZxid(), (hdr.getZxid() == expectedZxid));
+ Assert.assertTrue("excepting next transaction. expected=" + expectedZxid + ", retrieved=" + hdr.getZxid(), (hdr.getZxid() == expectedZxid));
lastZxid = hdr.getZxid();
}while(itr.next());
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/5fdd70ac/src/java/test/org/apache/zookeeper/test/MultiTransactionTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/test/MultiTransactionTest.java b/src/java/test/org/apache/zookeeper/test/MultiTransactionTest.java
index fb864f5..a95fc50 100644
--- a/src/java/test/org/apache/zookeeper/test/MultiTransactionTest.java
+++ b/src/java/test/org/apache/zookeeper/test/MultiTransactionTest.java
@@ -143,10 +143,10 @@ public class MultiTransactionTest extends ClientBase {
}
for (int i = 0; i < res.results.size(); i++) {
OpResult opResult = res.results.get(i);
- Assert.assertTrue("Did't recieve proper error response",
+ Assert.assertTrue("Did't receive proper error response",
opResult instanceof ErrorResult);
ErrorResult errRes = (ErrorResult) opResult;
- Assert.assertEquals("Did't recieve proper error code",
+ Assert.assertEquals("Did't receive proper error code",
expectedResultCodes.get(i).intValue(), errRes.getErr());
}
} else {
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/5fdd70ac/src/recipes/lock/src/c/acinclude.m4
----------------------------------------------------------------------
diff --git a/src/recipes/lock/src/c/acinclude.m4 b/src/recipes/lock/src/c/acinclude.m4
index d0041d8..a4d405a 100644
--- a/src/recipes/lock/src/c/acinclude.m4
+++ b/src/recipes/lock/src/c/acinclude.m4
@@ -7,7 +7,7 @@
# aminclude.m4 file and a compatible doxygen configuration file. Defines the
# following public macros:
#
-# DX_???_FEATURE(ON|OFF) - control the default setting fo a Doxygen feature.
+# DX_???_FEATURE(ON|OFF) - control the default setting of a Doxygen feature.
# Supported features are 'DOXYGEN' itself, 'DOT' for generating graphics,
# 'HTML' for plain HTML, 'CHM' for compressed HTML help (for MS users), 'CHI'
# for generating a seperate .chi file by the .chm file, and 'MAN', 'RTF',
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/5fdd70ac/src/recipes/queue/src/c/acinclude.m4
----------------------------------------------------------------------
diff --git a/src/recipes/queue/src/c/acinclude.m4 b/src/recipes/queue/src/c/acinclude.m4
index d0041d8..a4d405a 100644
--- a/src/recipes/queue/src/c/acinclude.m4
+++ b/src/recipes/queue/src/c/acinclude.m4
@@ -7,7 +7,7 @@
# aminclude.m4 file and a compatible doxygen configuration file. Defines the
# following public macros:
#
-# DX_???_FEATURE(ON|OFF) - control the default setting fo a Doxygen feature.
+# DX_???_FEATURE(ON|OFF) - control the default setting of a Doxygen feature.
# Supported features are 'DOXYGEN' itself, 'DOT' for generating graphics,
# 'HTML' for plain HTML, 'CHM' for compressed HTML help (for MS users), 'CHI'
# for generating a seperate .chi file by the .chm file, and 'MAN', 'RTF',