RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 01:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/stable'

Browse Source
This commit is contained in:
Sage Weil 2011-06-20 11:28:29 -07:00
commit 29e64df93e
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/ceph_argparse.cc
View File

@ -370,10 +370,10 @@ static void generic_usage(bool is_server)
{
cout << "\
--conf/-c Read configuration from the given configuration file\n\
-D Run in the foreground.\n\
-f Run in foreground. Show all log messages on stderr.\n\
--id set ID\n\
--name set ID.TYPE\n\
-d Run in foreground, log to stderr.\n\
-f Run in foreground, log to usual location.\n\
--id/-i set ID portion of my name\n\
--name/-n set name (TYPE.ID)\n\
--version show version and quit\n\
" << std::endl;

2
src/mds/journal.cc
View File

@ -849,8 +849,8 @@ void ESession::replay(MDS *mds)
} else {
session = mds->sessionmap.get_session(client_inst.name);
if (session->connection == NULL) {
mds->sessionmap.remove_session(session);
dout(10) << " removed session " << session->inst << dendl;
mds->sessionmap.remove_session(session);
} else {
session->clear(); // the client has reconnected; keep the Session, but reset
dout(10) << " reset session " << session->inst << " (they reconnected)" << dendl;

8
src/test/cli/ceph/help.t
View File

@ -15,10 +15,10 @@
-w or --watch
watch system status changes in real time (push)
--conf/-c Read configuration from the given configuration file
-D Run in the foreground.
-f Run in foreground. Show all log messages on stderr.
--id set ID
--name set ID.TYPE
-d Run in foreground, log to stderr.
-f Run in foreground, log to usual location.
--id/-i set ID portion of my name
--name/-n set name (TYPE.ID)
--version show version and quit
[1]

8
src/test/cli/radosgw_admin/help.t
View File

@ -43,10 +43,10 @@
--format=<format> specify output format for certain operations: xml,
json
--conf/-c Read configuration from the given configuration file
-D Run in the foreground.
-f Run in foreground. Show all log messages on stderr.
--id set ID
--name set ID.TYPE
-d Run in foreground, log to stderr.
-f Run in foreground, log to usual location.
--id/-i set ID portion of my name
--name/-n set name (TYPE.ID)
--version show version and quit
[1]