diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
| commit | a827c5eab32a43ade5551259ea56a6a1af7e861b (patch) | |
| tree | e6707df68f72baa8645210ba931272285116ad85 /cli/src/cli.c | |
| parent | 46d333783a968ab39e0beade9c7a1eec8035f8b1 (diff) | |
| parent | 99bfc2a2a1689da1e173cb2f8ef54d2b09ef3a5d (diff) | |
Merge branch 'upstream'
Conflicts:
glusterfs.spec.in
xlators/mgmt/glusterd/src/Makefile.am
xlators/mgmt/glusterd/src/glusterd-utils.c
xlators/mgmt/glusterd/src/glusterd.h
Change-Id: I27bdcf42b003cfc42d6ad981bd2bf8180176806d
Diffstat (limited to 'cli/src/cli.c')
| -rw-r--r-- | cli/src/cli.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cli/src/cli.c b/cli/src/cli.c index a77200c66..2c703689b 100644 --- a/cli/src/cli.c +++ b/cli/src/cli.c @@ -553,9 +553,9 @@ cli_rpc_init (struct cli_state *state) if (!options) goto out; - /* Connect using to glusterd using the specified method, giving - * preference to unix socket connection. If nothing is specified connect - * to the default glusterd socket + /* Connect to glusterd using the specified method, giving preference + * to a unix socket connection. If nothing is specified, connect to + * the default glusterd socket. */ if (state->glusterd_sock) { gf_log ("cli", GF_LOG_INFO, "Connecting to glusterd using " |