lp:~marcustomlinson/unity-scopes-api/rename_tags_to_keywords

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity-scopes-api/devel at revision 551

PS Jenkins bot (community): Approve (continuous-integration) on 2014-12-03

Michi Henning (community): Needs Fixing on 2014-12-03

Diff: 877 lines (+140/-120)

31 files modified

CONFIGFILES (+7/-7)
RELEASE_NOTES.md (+4/-0)
STRUCTS (+1/-1)
debian/changelog (+6/-0)
debian/libunity-scopes3.symbols (+5/-5)
doc/tutorial.dox (+4/-4)
include/unity/scopes/ScopeMetadata.h (+4/-4)
include/unity/scopes/internal/ScopeConfig.h (+2/-2)
include/unity/scopes/internal/ScopeMetadataImpl.h (+3/-3)
include/unity/scopes/internal/smartscopes/SmartScopesClient.h (+1/-1)
include/unity/scopes/testing/ScopeMetadataBuilder.h (+1/-1)
scoperegistry/scoperegistry.cpp (+1/-1)
src/scopes/ScopeMetadata.cpp (+2/-2)
src/scopes/internal/ScopeConfig.cpp (+9/-8)
src/scopes/internal/ScopeMetadataImpl.cpp (+13/-13)
src/scopes/internal/smartscopes/SSRegistryObject.cpp (+1/-1)
src/scopes/internal/smartscopes/SmartScopesClient.cpp (+7/-7)
src/scopes/testing/ScopeMetadataBuilder.cpp (+5/-5)
test/gtest/scopes/Registry/Registry_test.cpp (+6/-6)
test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in (+1/-1)
test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt (+6/-6)
test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp (+13/-13)
test/gtest/scopes/internal/ScopeConfig/bad_keywords.ini.in (+1/-1)
test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in (+1/-1)
test/gtest/scopes/internal/ScopeConfig/empty_keywords.ini.in (+1/-1)
test/gtest/scopes/internal/ScopeConfig/single_keyword.ini.in (+1/-1)
test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp (+17/-11)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py (+1/-1)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp (+7/-7)
test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp (+5/-5)
test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp (+4/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

552. By Marcus Tomlinson on 2014-12-03

Updated CONFIGFILES and STRUCTS

551. By Marcus Tomlinson on 2014-12-03

Renamed all occurrences of "tag" with "keyword"

550. By Marcus Tomlinson on 2014-12-02

Added some missing code that should've gone in when adding the 'Tags' key

549. By Michi Henning on 2014-12-02

Added a bunch of compiler warnings to help us stay out of trouble. These are not part of the usual -Wall/-Wextra/-pedantic.

Approved by Marcus Tomlinson, PS Jenkins bot.

548. By Michi Henning on 2014-12-02

Fixed incorrect path name for clang style file.

Approved by Marcus Tomlinson, PS Jenkins bot.

547. By Michi Henning on 2014-12-01

Added valgrind suppression for broken zmq code.
Fixed clang warning in Logger.cpp.

Approved by PS Jenkins bot, Pawel Stolowski.

546. By PS Jenkins bot on 2014-12-01

Merge trunk back to devel.

Approved by PS Jenkins bot, Pete Woods.

545. By Marcus Tomlinson on 2014-12-01

Cleaned up odds and ends in the code.

Approved by PS Jenkins bot, Michi Henning.

544. By Paweł Stołowski on 2014-12-01

Implemented BufferedResultForwarder (and internal BufferedSearchReplyImpl) which (combined together) provide a helper for aggregator scopes to aggregate results from multiple child scopes and push them in the order that ensures desired order of categories in the UI.

Approved by PS Jenkins bot.

543. By Michi Henning on 2014-12-01

Fixed race in RegistryObject that could cause invalidated iterator to be dereferenced.

Approved by Marcus Tomlinson, PS Jenkins bot.