RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-17 07:57:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

authx -> cephx everywhere it's used

Browse Source 
The term authx was in the mount.ceph man page, and got accidentally
copied into rbd help.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
This commit is contained in:
Josh Durgin 2011-12-15 13:41:56 -08:00
parent da2860599a
commit 4eb836546d
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/man/8/mount.ceph.rst
View File

@ -81,10 +81,10 @@ Options
string, set the name of the hidden snapdir. Default: .snap
:command:`name`
string, used with authx, Default: guest
string, used with cephx, Default: guest
:command:`secret`
string, used with authx
string, used with cephx
:command:`ip`
my ip

4
man/mount.ceph.8
View File

@ -107,10 +107,10 @@ memory. Default: calculated from available memory
string, set the name of the hidden snapdir. Default: .snap
.TP
.B \fBname\fP
string, used with authx, Default: guest
string, used with cephx, Default: guest
.TP
.B \fBsecret\fP
string, used with authx
string, used with cephx
.TP
.B \fBip\fP
my ip

2
src/rbd.cc
View File

@ -99,7 +99,7 @@ void usage()
<< "\n"
<< "For the map command:\n"
<< " --user <username> rados user to authenticate as\n"
<< " --secret <path> file containing secret key for use with authx\n";
<< " --secret <path> file containing secret key for use with cephx\n";
}
void usage_exit()

2
src/test/cli/rbd/help.t
View File

@ -37,4 +37,4 @@
For the map command:
--user <username> rados user to authenticate as
--secret <path> file containing secret key for use with authx
--secret <path> file containing secret key for use with cephx

18
src/test/cli/rbd/invalid-snap-usage.t
View File

@ -38,7 +38,7 @@
For the map command:
--user <username> rados user to authenticate as
--secret <path> file containing secret key for use with authx
--secret <path> file containing secret key for use with cephx
[1]
$ rbd resize img@snap
error: snapname specified for a command that doesn't use it
@ -80,7 +80,7 @@
For the map command:
--user <username> rados user to authenticate as
--secret <path> file containing secret key for use with authx
--secret <path> file containing secret key for use with cephx
[1]
$ rbd import --snap=snap1 /bin/ls ls
error: snapname specified for a command that doesn't use it
@ -122,7 +122,7 @@
For the map command:
--user <username> rados user to authenticate as
--secret <path> file containing secret key for use with authx
--secret <path> file containing secret key for use with cephx
[1]
$ rbd create --snap=snap img
error: snapname specified for a command that doesn't use it
@ -164,7 +164,7 @@
For the map command:
--user <username> rados user to authenticate as
--secret <path> file containing secret key for use with authx
--secret <path> file containing secret key for use with cephx
[1]
$ rbd rm --snap=snap img
error: snapname specified for a command that doesn't use it
@ -206,7 +206,7 @@
For the map command:
--user <username> rados user to authenticate as
--secret <path> file containing secret key for use with authx
--secret <path> file containing secret key for use with cephx
[1]
$ rbd rename --snap=snap img
error: snapname specified for a command that doesn't use it
@ -248,7 +248,7 @@
For the map command:
--user <username> rados user to authenticate as
--secret <path> file containing secret key for use with authx
--secret <path> file containing secret key for use with cephx
[1]
$ rbd ls --snap=snap rbd
error: snapname specified for a command that doesn't use it
@ -290,7 +290,7 @@
For the map command:
--user <username> rados user to authenticate as
--secret <path> file containing secret key for use with authx
--secret <path> file containing secret key for use with cephx
[1]
$ rbd snap ls --snap=snap img
error: snapname specified for a command that doesn't use it
@ -332,7 +332,7 @@
For the map command:
--user <username> rados user to authenticate as
--secret <path> file containing secret key for use with authx
--secret <path> file containing secret key for use with cephx
[1]
$ rbd watch --snap=snap img
error: snapname specified for a command that doesn't use it
@ -374,5 +374,5 @@
For the map command:
--user <username> rados user to authenticate as
--secret <path> file containing secret key for use with authx
--secret <path> file containing secret key for use with cephx
[1]