From e3563f6dfda6c3f44ecff52ac22738ff74413ae1 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 31 May 2018 15:17:26 -0500 Subject: changed 'sometime' messsages to 'some time' Change-Id: I0936229fc84c011db7791218bb566c971fdea174 fixes: bz#1584864 Signed-off-by: Levi Baber --- xlators/mgmt/glusterd/src/glusterd-handler.c | 4 ++-- xlators/mgmt/glusterd/src/glusterd-mgmt.c | 2 +- xlators/mgmt/glusterd/src/glusterd-rpc-ops.c | 6 +++--- xlators/mgmt/glusterd/src/glusterd-syncop.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'xlators/mgmt/glusterd/src') diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 6f6b4cf8aed..9e8a586cbc4 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -764,7 +764,7 @@ glusterd_op_txn_begin (rpcsvc_request_t *req, glusterd_op_t op, void *ctx, ret); snprintf (err_str, err_len, "Another transaction is in progress. " - "Please try again after sometime."); + "Please try again after some time."); goto out; } } else { @@ -803,7 +803,7 @@ glusterd_op_txn_begin (rpcsvc_request_t *req, glusterd_op_t op, void *ctx, "Unable to acquire lock for %s", volname); snprintf (err_str, err_len, "Another transaction is in progress for %s. " - "Please try again after sometime.", volname); + "Please try again after some time.", volname); goto out; } } diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-mgmt.c index 30891a006b6..72afa394624 100644 --- a/xlators/mgmt/glusterd/src/glusterd-mgmt.c +++ b/xlators/mgmt/glusterd/src/glusterd-mgmt.c @@ -820,7 +820,7 @@ out: ret = gf_asprintf (op_errstr, "Another transaction is in progress. " - "Please try again after sometime."); + "Please try again after some time."); if (ret == -1) *op_errstr = NULL; diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c index 0770d6dc9a3..d9eb7898034 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c @@ -789,7 +789,7 @@ __glusterd_cluster_lock_cbk (struct rpc_req *req, struct iovec *iov, opinfo.op_ret = op_ret; opinfo.op_errstr = gf_strdup ("Another transaction could be in " "progress. Please try again after" - " sometime."); + " some time."); } else { event_type = GD_OP_EVENT_RCVD_ACC; } @@ -908,7 +908,7 @@ glusterd_mgmt_v3_lock_peers_cbk_fn (struct rpc_req *req, struct iovec *iov, opinfo.op_ret = op_ret; opinfo.op_errstr = gf_strdup ("Another transaction could be in " "progress. Please try again after" - " sometime."); + " some time."); } else { event_type = GD_OP_EVENT_RCVD_ACC; } @@ -1019,7 +1019,7 @@ glusterd_mgmt_v3_unlock_peers_cbk_fn (struct rpc_req *req, struct iovec *iov, opinfo.op_ret = op_ret; opinfo.op_errstr = gf_strdup ("Another transaction could be in " "progress. Please try again after" - " sometime."); + " some time."); } else { event_type = GD_OP_EVENT_RCVD_ACC; } diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c index d00a3d0f152..826a6fe015d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-syncop.c +++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c @@ -1249,7 +1249,7 @@ gd_lock_op_phase (glusterd_conf_t *conf, glusterd_op_t op, dict_t *op_ctx, else { ret = gf_asprintf (op_errstr, "Another transaction " "could be in progress. Please try " - "again after sometime."); + "again after some time."); if (ret == -1) *op_errstr = NULL; @@ -1867,7 +1867,7 @@ gd_sync_task_begin (dict_t *op_ctx, rpcsvc_request_t * req) "Unable to acquire lock"); gf_asprintf (&op_errstr, "Another transaction is in progress. " - "Please try again after sometime."); + "Please try again after some time."); goto out; } } else { @@ -1911,7 +1911,7 @@ gd_sync_task_begin (dict_t *op_ctx, rpcsvc_request_t * req) "Unable to acquire lock for %s", volname); gf_asprintf (&op_errstr, "Another transaction is in progress " - "for %s. Please try again after sometime.", + "for %s. Please try again after some time.", volname); goto out; } @@ -1927,7 +1927,7 @@ global: "Unable to acquire lock for %s", global); gf_asprintf (&op_errstr, "Another transaction is in progress " - "for %s. Please try again after sometime.", + "for %s. Please try again after some time.", global); is_global = _gf_false; goto out; -- cgit