hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-17982 correct spelling error of 'occured'
Date Thu, 29 Jun 2017 22:10:16 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-2 2db99eb74 -> f6dd43be7


HBASE-17982 correct spelling error of 'occured'

Signed-off-by: Michael Stack <stack@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f6dd43be
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f6dd43be
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f6dd43be

Branch: refs/heads/branch-2
Commit: f6dd43be70b97d60e8eea0f4f04fe98630840018
Parents: 2db99eb
Author: 张世彬10204932 <zhang.shibin@zte.com.cn>
Authored: Tue May 2 17:18:00 2017 +0800
Committer: Michael Stack <stack@apache.org>
Committed: Thu Jun 29 15:10:08 2017 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/client/ClientIdGenerator.java   | 2 +-
 .../apache/hadoop/hbase/chaos/policies/DoActionsOncePolicy.java  | 2 +-
 .../hadoop/hbase/chaos/policies/PeriodicRandomActionPolicy.java  | 2 +-
 .../main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java  | 2 +-
 .../java/org/apache/hadoop/hbase/zookeeper/DeletionListener.java | 2 +-
 .../java/org/apache/hadoop/hbase/TestJMXConnectorServer.java     | 4 ++--
 .../apache/hadoop/hbase/filter/TestComparatorSerialization.java  | 2 +-
 .../org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java    | 2 +-
 .../apache/hadoop/hbase/replication/TestMasterReplication.java   | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/f6dd43be/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java
index 49e1765..ed03b17 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java
@@ -78,7 +78,7 @@ final class ClientIdGenerator {
 
   /**
    * @return Some IPv4/IPv6 address available on the current machine that is up, not virtual
-   *         and not a loopback address. Empty array if none can be found or error occured.
+   *         and not a loopback address. Empty array if none can be found or error occurred.
    */
   public static byte[] getIpAddressBytes() {
     try {

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6dd43be/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/DoActionsOncePolicy.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/DoActionsOncePolicy.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/DoActionsOncePolicy.java
index 35f06eb..0d8564d 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/DoActionsOncePolicy.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/DoActionsOncePolicy.java
@@ -49,7 +49,7 @@ public class DoActionsOncePolicy extends PeriodicPolicy {
     try {
       action.perform();
     } catch (Exception ex) {
-      LOG.warn("Exception occured during performing action: "
+      LOG.warn("Exception occurred during performing action: "
           + StringUtils.stringifyException(ex));
     }
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6dd43be/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/PeriodicRandomActionPolicy.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/PeriodicRandomActionPolicy.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/PeriodicRandomActionPolicy.java
index 8b76e49..b11aa32 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/PeriodicRandomActionPolicy.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/PeriodicRandomActionPolicy.java
@@ -58,7 +58,7 @@ public class PeriodicRandomActionPolicy extends PeriodicPolicy {
     try {
       action.perform();
     } catch (Exception ex) {
-      LOG.warn("Exception occured during performing action: "
+      LOG.warn("Exception occurred during performing action: "
           + StringUtils.stringifyException(ex));
     }
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6dd43be/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java
index b9f52b8..36a9105 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java
@@ -315,7 +315,7 @@ public class HFileArchiver {
    * @param start time the archiving started - used for resolving archive
    *          conflicts.
    * @return the list of failed to archive files.
-   * @throws IOException if an unexpected file operation exception occured
+   * @throws IOException if an unexpected file operation exception occurred
    */
   private static List<File> resolveAndArchive(FileSystem fs, Path baseArchiveDir,
       Collection<File> toArchive, long start) throws IOException {

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6dd43be/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/DeletionListener.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/DeletionListener.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/DeletionListener.java
index b60529f..a4fd78c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/DeletionListener.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/DeletionListener.java
@@ -44,7 +44,7 @@ public class DeletionListener extends ZooKeeperListener {
    * @param zkWatcher ZookeeperWatcher instance
    * @param pathToWatch (Fully qualified) ZNode path that we are waiting to
    *                    be deleted.
-   * @param deletedLatch Count down on this latch when deletion has occured.
+   * @param deletedLatch Count down on this latch when deletion has occurred.
    */
   public DeletionListener(ZooKeeperWatcher zkWatcher, String pathToWatch,
       CountDownLatch deletedLatch) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6dd43be/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXConnectorServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXConnectorServer.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXConnectorServer.java
index 44220f5..577cad8 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXConnectorServer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXConnectorServer.java
@@ -89,7 +89,7 @@ public class TestJMXConnectorServer {
       LOG.info("Stopping HMaster...");
       admin.stopMaster();
     } catch (AccessDeniedException e) {
-      LOG.info("Exception occured while stopping HMaster. ", e);
+      LOG.info("Exception occurred while stopping HMaster. ", e);
       accessDenied = true;
     }
     Assert.assertTrue(accessDenied);
@@ -157,7 +157,7 @@ public class TestJMXConnectorServer {
       LOG.info("Stopping HMaster...");
       admin.shutdown();
     } catch (AccessDeniedException e) {
-      LOG.error("Exception occured while stopping HMaster. ", e);
+      LOG.error("Exception occurred while stopping HMaster. ", e);
       accessDenied = true;
     }
     Assert.assertTrue(accessDenied);

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6dd43be/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java
index 0de2f41..2befef0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java
@@ -75,7 +75,7 @@ public class TestComparatorSerialization {
     try {
       new RegexStringComparator("regex", Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
     } catch (Throwable t) {
-      assertNull("Exception occured while created the RegexStringComparator object", t);
+      assertNull("Exception occurred while created the RegexStringComparator object", t);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6dd43be/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
index ddf9a3d..bdd3de2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
@@ -577,7 +577,7 @@ public class TestHFileBlockIndex {
      reader.close();
    }
 
-   // to check if ArrayIndexOutOfBoundsException occured
+   // to check if ArrayIndexOutOfBoundsException occurred
    assertFalse(hasArrayIndexOutOfBoundsException);
  }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6dd43be/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
index cfc96c2..1110d1d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
@@ -548,7 +548,7 @@ public class TestMasterReplication {
         }
       }
     } catch (Exception e) {
-      LOG.warn("Exception occured while closing the object:", e);
+      LOG.warn("Exception occurred while closing the object:", e);
     }
   }
 


Mime
View raw message