[hbase] branch branch-2.1 updated: HBASE-21257 misspelled words.[occured -> occurred]

[zhangduo]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new 0111324  HBASE-21257 misspelled words.[occured -> occurred]
0111324 is described below

commit 01113241a348f32baff29d234c8d325941898882
Author: zhanggangxue <zhanggang...@mininglamp.com>
AuthorDate: Sun Apr 14 21:39:59 2019 +0800

    HBASE-21257 misspelled words.[occured -> occurred]
---
 .../src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java     | 4 ++--
 .../src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java 
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java
index 8ad241a..acdd7b0 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java
@@ -55,7 +55,7 @@ public class Monkeys implements Closeable {
       try {
         monkeyRunner.getAndStartMonkey();
       } catch (Exception e) {
-        LOG.error("Exception occured when running chaos monkeys: ", e);
+        LOG.error("Exception occurred when running chaos monkeys: ", e);
       }
     };
     this.executor = Executors.newSingleThreadExecutor(new 
ThreadFactoryBuilder()
@@ -91,7 +91,7 @@ public class Monkeys implements Closeable {
       executor.awaitTermination(10, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
-      LOG.warn("Interruption occured while stopping chaos monkeys " + e);
+      LOG.warn("Interruption occurred while stopping chaos monkeys " + e);
     }
   }
 }
diff --git 
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java 
b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java
index 9de033d..cd1bc4d 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java
@@ -112,7 +112,7 @@ public class ScannerResource extends ResourceBase {
       servlet.getMetrics().incrementSucessfulPutRequests(1);
       return Response.created(uri).build();
     } catch (Exception e) {
-      LOG.error("Exception occured while processing " + 
uriInfo.getAbsolutePath() + " : ", e);
+      LOG.error("Exception occurred while processing " + 
uriInfo.getAbsolutePath() + " : ", e);
       servlet.getMetrics().incrementFailedPutRequests(1);
       if (e instanceof TableNotFoundException) {
         return Response.status(Response.Status.NOT_FOUND)