Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/qpid-cpp
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/9158a4ac Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/9158a4ac Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/9158a4ac Branch: refs/heads/master Commit: 9158a4acb25cc1f31af8a99d0caf1a5109e79156 Parents: 6716fb4 3d18b1d Author: Kim van der Riet <[email protected]> Authored: Wed Feb 15 12:33:23 2017 -0500 Committer: Kim van der Riet <[email protected]> Committed: Wed Feb 15 12:33:23 2017 -0500 ---------------------------------------------------------------------- CMakeLists.txt | 2 +- management/python/bin/qpid-config | 6 +----- management/python/bin/qpid-ha | 5 +---- management/python/bin/qpid-printevents | 5 +---- management/python/bin/qpid-receive | 5 +---- management/python/bin/qpid-send | 8 +++----- management/python/bin/qpid-stat | 6 +----- src/qpid/log/Logger.cpp | 20 ++++++++------------ src/qpid/sys/posix/Mutex.h | 2 +- src/qpid/sys/windows/Mutex.h | 2 +- src/qpid/sys/windows/WinSocket.cpp | 1 - 11 files changed, 19 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
