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/ClientChannel.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/ClientChannel.cpp')
| -rw-r--r-- | nxcomp/src/ClientChannel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nxcomp/src/ClientChannel.cpp b/nxcomp/src/ClientChannel.cpp index f01ad6d7b..1c6354897 100644 --- a/nxcomp/src/ClientChannel.cpp +++ b/nxcomp/src/ClientChannel.cpp @@ -5782,7 +5782,7 @@ int ClientChannel::handleSplitEvent(DecodeBuffer &decodeBuffer) #if defined(TEST) || defined(SPLIT) *logofs << "handleSplitEvent: SPLIT! Spent " - << diffTimestamp(startTs, getTimestamp()) << " Ms " + << diffTimestamp(startTs, getTimestamp()) << " ms " << "handling abort split events for FD#" << fd_ << ".\n" << logofs_flush; #endif |