← Back to branch summary

~marcustomlinson/unity-scopes-api/relax-process-timeout

~marcustomlinson/unity-scopes-api/relax-process-timeout

Viewing all changes in revision 351.

Committer: CI Train Bot
Author(s): Pawel Stolowski
Date: 2015-09-21 13:32:10 UTC
mfrom: (261.1.44 staging)
Revision ID: ci-train-bot@canonical.com-20150921133210-53i4a31z2kkik91u

Merged devel.
Approved by: Marcus Tomlinson

files modified:
include/unity/scopes/internal/Utils.h

scoperegistry/scoperegistry.cpp

src/scopes/internal/JsonCppNode.cpp

src/scopes/internal/Utils.cpp

src/scopes/internal/zmq_middleware/ZmqObject.cpp

test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp

test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.ini.in

test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp

test/gtest/scopes/internal/Utils/Utils_test.cpp

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

unity-scopes.map

Show diffs side-by-side

added added

removed removed

include/unity/scopes/internal/Utils.h

scoperegistry/scoperegistry.cpp

src/scopes/internal/JsonCppNode.cpp

src/scopes/internal/Utils.cpp

src/scopes/internal/zmq_middleware/ZmqObject.cpp

test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp

test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.ini.in

test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp

test/gtest/scopes/internal/Utils/Utils_test.cpp

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

unity-scopes.map

Older »