diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-05 18:12:11 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-05 18:12:11 +0100 |
| commit | 05cf54af3de6f3e32e08d7bc32e10d58221a068b (patch) | |
| tree | 05ee5221e4824d1210682e1be268c981684194f3 /nxcomp/src/Children.cpp | |
| parent | 7f777e01e3bb8780ba91e70171a0aae78a95692e (diff) | |
| parent | b8c929773fac19dad8af05d0bc64b1b3fed88309 (diff) | |
| download | nx-libs-05cf54af3de6f3e32e08d7bc32e10d58221a068b.tar.gz nx-libs-05cf54af3de6f3e32e08d7bc32e10d58221a068b.tar.bz2 nx-libs-05cf54af3de6f3e32e08d7bc32e10d58221a068b.zip | |
Merge branch 'uli42-pr/fix_global_tcpFD' into 3.6.x
Attributes GH PR #579: https://github.com/ArcticaProject/nx-libs/pull/579
Diffstat (limited to 'nxcomp/src/Children.cpp')
| -rw-r--r-- | nxcomp/src/Children.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nxcomp/src/Children.cpp b/nxcomp/src/Children.cpp index e77d1defd..9486f189a 100644 --- a/nxcomp/src/Children.cpp +++ b/nxcomp/src/Children.cpp @@ -628,7 +628,7 @@ int NXTransWatchdog(int timeout) { #ifdef TEST *logofs << "NXTransWatchdog: Timeout of " << timeout - << " Ms raised in watchdog.\n" << logofs_flush; + << " ms raised in watchdog.\n" << logofs_flush; #endif // @@ -645,7 +645,7 @@ int NXTransWatchdog(int timeout) { #ifdef TEST *logofs << "NXTransWatchdog: Waiting for the timeout " - << "with " << timeout - diffTs << " Ms to run.\n" + << "with " << timeout - diffTs << " ms to run.\n" << logofs_flush; #endif @@ -847,7 +847,7 @@ int NXTransKeeper(int caches, int images, const char *root) #ifdef TEST *logofs << "NXTransKeeper: Going to sleep for " - << timeout / 20 << " Ms.\n" << logofs_flush; + << timeout / 20 << " ms.\n" << logofs_flush; #endif usleep(timeout / 20 * 1000); @@ -937,7 +937,7 @@ int NXTransKeeper(int caches, int images, const char *root) #ifdef TEST *logofs << "NXTransKeeper: Going to sleep for " << timeout - << " Ms.\n" << logofs_flush; + << " ms.\n" << logofs_flush; #endif usleep(timeout * 1000); |