diff options
author | Colin Patrick McCabe <cmccabe@alumni.cmu.edu> | 2011-07-20 16:26:18 -0700 |
---|---|---|
committer | Colin Patrick McCabe <cmccabe@alumni.cmu.edu> | 2011-07-20 16:26:18 -0700 |
commit | 15e3cb789ac450b34e79d7d05f2fecf8e8e875d8 (patch) | |
tree | 9f35075fafd334885dd70ad13abab7c2e5c8418f /src/vstart.sh | |
parent | 1b0d9ff228232eb39da155292a2978266734ac74 (diff) | |
parent | a2627f4a08166b106f79560f48e66082482cbd66 (diff) | |
download | ceph-15e3cb789ac450b34e79d7d05f2fecf8e8e875d8.tar.gz |
Merge branch 'wip-proflogger'
Conflicts:
src/common/config.cc
src/common/config.h
Diffstat (limited to 'src/vstart.sh')
-rwxr-xr-x | src/vstart.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/vstart.sh b/src/vstart.sh index d8fac39fba6..ecce59b94bb 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -249,8 +249,7 @@ DAEMONOPTS=" log file = out/\$host log per instance = true log sym history = 100 - profiling logger = true - profiling logger dir = log + admin socket = out/asok.\$name chdir = \"\" pid file = out/\$name.pid " |