7 files changed, 8 insertions, 8 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c
index 3f56636cdf0..db43ecb4d31 100644
--- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c
+++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c
@@ -1764,7 +1764,7 @@ _iterate_log_rotate_mst_slv (dict_t *this, char *key, data_t *value, void *data)
                 slave++;
         else {
                 gf_log ("", GF_LOG_ERROR, "geo-replication log-rotate: slave (%s) "
-                        "not comfirming to format", slave);
+                        "not conforming to format", slave);
                 return;
         }
 
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 225bf6791f1..8f2d55aaf3a 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -3241,7 +3241,7 @@ glusterd_op_sm_inject_event (glusterd_op_sm_event_type_t event_type,
 
         event->ctx = ctx;
 
-        gf_log ("glusterd", GF_LOG_DEBUG, "Enqueuing event: '%s'",
+        gf_log ("glusterd", GF_LOG_DEBUG, "Enqueue event: '%s'",
                 glusterd_op_sm_event_name_get (event->event));
         list_add_tail (&event->list, &gd_op_sm_queue);
 
diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
index a556e335b95..08865f38f18 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
@@ -371,7 +371,7 @@ int
 glusterd_defrag_stop (glusterd_volinfo_t *volinfo, u_quad_t *files,
                       u_quad_t *size, char *op_errstr, size_t len)
 {
-        /* TODO: set a variaeble 'stop_defrag' here, it should be checked
+        /* TODO: set a variable 'stop_defrag' here, it should be checked
            in defrag loop */
         int     ret = -1;
         GF_ASSERT (volinfo);
diff --git a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
index 640fd07e0e1..e883b289f9f 100644
--- a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
+++ b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
@@ -1355,7 +1355,7 @@ out:
         return ret;
 }
 
-/* Set src-brick's port number to be used in the maintainance mount
+/* Set src-brick's port number to be used in the maintenance mount
  * after all commit acks are received.
  */
 static int
@@ -1840,7 +1840,7 @@ glusterd_do_replace_brick (void *data)
 		gf_timer_call_cancel (THIS->ctx, priv->timer);
 		priv->timer = NULL;
                 gf_log ("", GF_LOG_DEBUG,
-                        "Cancelled timer thread");
+                        "Cancelling timer thread");
 	}
 
         gf_log ("", GF_LOG_DEBUG,
diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
index 8b572afbff6..853fd931d22 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
@@ -366,7 +366,7 @@ out:
 
         GF_ASSERT (ctx);
 
-        if (ctx->req)//reverse probe doesnt have req
+        if (ctx->req)//reverse probe doesn't have req
                 ret = glusterd_xfer_cli_probe_resp (ctx->req, op_ret, op_errno,
                                                     ctx->hostname, ctx->port);
         if (!ret) {
diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.c b/xlators/mgmt/glusterd/src/glusterd-sm.c
index 2518ee0d496..259c247f401 100644
--- a/xlators/mgmt/glusterd/src/glusterd-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-sm.c
@@ -925,7 +925,7 @@ int
 glusterd_friend_sm_inject_event (glusterd_friend_sm_event_t *event)
 {
         GF_ASSERT (event);
-        gf_log ("glusterd", GF_LOG_DEBUG, "Enqueuing event: '%s'",
+        gf_log ("glusterd", GF_LOG_DEBUG, "Enqueue event: '%s'",
                 glusterd_friend_sm_event_name_get (event->event));
         list_add_tail (&event->list, &gd_friend_sm_queue);
 
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 2ade1c57431..0de937badf1 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -982,7 +982,7 @@ glusterd_check_option_exists (char *key, char **completion)
         ret = volopt_trie (key, completion);
         if (ret) {
                 gf_log ("", GF_LOG_ERROR,
-                        "Some error occured during keyword hinting");
+                        "Some error occurred during keyword hinting");
         }
 
         return ret;