← Back to branch summary

~stolowski/+junk/revert-zmq-reconnect-fix

~stolowski/+junk/revert-zmq-reconnect-fix

Viewing all changes in revision 256.

Committer: CI bot
Author(s): Pawel Stolowski
Date: 2014-10-06 12:03:05 UTC
mfrom: (163.300.21 staging)
Revision ID: ps-jenkins@lists.canonical.com-20141006120305-evhuxbb2f6pgaie0

Merge devel. Fixes: 1376054
Approved by: PS Jenkins bot, Marcus Tomlinson

files added:
tools/symbol_diff.in

files modified:
HACKING

STRUCTS

debian/changelog

debian/control

debian/libunity-scopes3.symbols

include/unity/scopes/internal/smartscopes/HttpClientInterface.h

include/unity/scopes/internal/smartscopes/HttpClientQt.h

include/unity/scopes/internal/smartscopes/HttpClientQtThread.h

include/unity/scopes/internal/smartscopes/SmartScopesClient.h

include/unity/scopes/internal/zmq_middleware/ConnectionPool.h

include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h

include/unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h

include/unity/scopes/internal/zmq_middleware/ZmqScope.h

include/unity/scopes/internal/zmq_middleware/ZmqSender.h

src/scopes/internal/smartscopes/HttpClientQt.cpp

src/scopes/internal/smartscopes/HttpClientQtThread.cpp

src/scopes/internal/smartscopes/SmartScope.cpp

src/scopes/internal/smartscopes/SmartScopesClient.cpp

src/scopes/internal/zmq_middleware/ConnectionPool.cpp

src/scopes/internal/zmq_middleware/ObjectAdapter.cpp

src/scopes/internal/zmq_middleware/ZmqObject.cpp

src/scopes/internal/zmq_middleware/ZmqRegistry.cpp

src/scopes/internal/zmq_middleware/ZmqScope.cpp

src/scopes/internal/zmq_middleware/ZmqSender.cpp

test/gtest/scopes/Registry/Registry_test.cpp

test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp

test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py

test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp

test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp

test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp

test/headers/compile_headers.py

tools/CMakeLists.txt

valgrind-suppress

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/libunity-scopes3.symbols

include/unity/scopes/internal/smartscopes/HttpClientInterface.h

include/unity/scopes/internal/smartscopes/HttpClientQt.h

include/unity/scopes/internal/smartscopes/HttpClientQtThread.h

include/unity/scopes/internal/smartscopes/SmartScopesClient.h

include/unity/scopes/internal/zmq_middleware/ConnectionPool.h

include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h

include/unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h

include/unity/scopes/internal/zmq_middleware/ZmqScope.h

include/unity/scopes/internal/zmq_middleware/ZmqSender.h

src/scopes/internal/smartscopes/HttpClientQt.cpp

src/scopes/internal/smartscopes/HttpClientQtThread.cpp

src/scopes/internal/smartscopes/SmartScope.cpp

src/scopes/internal/smartscopes/SmartScopesClient.cpp

src/scopes/internal/zmq_middleware/ConnectionPool.cpp

src/scopes/internal/zmq_middleware/ObjectAdapter.cpp

src/scopes/internal/zmq_middleware/ZmqObject.cpp

src/scopes/internal/zmq_middleware/ZmqRegistry.cpp

src/scopes/internal/zmq_middleware/ZmqScope.cpp

src/scopes/internal/zmq_middleware/ZmqSender.cpp

test/gtest/scopes/Registry/Registry_test.cpp

test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp

test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py

test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp

test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp

test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp

test/headers/compile_headers.py

tools/CMakeLists.txt

tools/symbol_diff.in

valgrind-suppress

Older »