Merge lp://staging/unity-scopes-api/staging into lp://staging/unity-scopes-api
Proposed by
Marcus Tomlinson
| Status: | Merged |
|---|---|
| Approved by: | James Henstridge |
| Approved revision: | 332 |
| Merged at revision: | 369 |
| Proposed branch: | lp://staging/unity-scopes-api/staging |
| Merge into: | lp://staging/unity-scopes-api |
| Diff against target: |
895 lines (+200/-146) 33 files modified
CONFIGFILES (+5/-5) HACKING (+22/-40) RELEASE_NOTES.md (+11/-0) STRUCTS (+2/-3) debian/LAST_ABI_ADDITION_QT-VERSION (+1/-0) debian/LAST_ABI_ADDITION_VERSION (+1/-0) debian/VERSION (+1/-1) debian/bileto_pre_release_hook (+8/-3) debian/changelog (+19/-0) debian/control (+5/-5) debian/control.in (+5/-5) debian/libunity-scopes-qt.shlibs.in (+1/-1) debian/libunity-scopes.shlibs.in (+1/-1) debian/source/format (+1/-1) include/unity/scopes/SearchListenerBase.h (+9/-0) include/unity/scopes/SearchReply.h (+8/-1) include/unity/scopes/internal/SearchReplyImpl.h (+2/-1) include/unity/scopes/testing/MockScope.h (+2/-0) include/unity/scopes/testing/MockSearchReply.h (+1/-0) include/unity/scopes/utility/internal/BufferedSearchReplyImpl.h (+1/-0) src/scopes/SearchListenerBase.cpp (+5/-0) src/scopes/internal/OnlineAccountClientImpl.cpp (+13/-1) src/scopes/internal/RegistryConfig.cpp (+2/-2) src/scopes/internal/ResultReplyObject.cpp (+5/-10) src/scopes/internal/SearchReplyImpl.cpp (+7/-14) src/scopes/internal/zmq_middleware/ZmqConfig.cpp (+6/-6) src/scopes/testing/InProcessBenchmark.cpp (+5/-0) src/scopes/utility/internal/BufferedSearchReplyImpl.cpp (+5/-0) test/gtest/scopes/Filters/Filters_test.cpp (+21/-10) test/gtest/scopes/Filters/TestScope.h (+19/-2) test/gtest/scopes/ResultCache/ResultCache_test.cpp (+1/-32) test/gtest/scopes/ResultCache/no_filter_state_cache (+0/-1) test/gtest/scopes/internal/smartscopes/CMakeLists.txt (+5/-1) |
| To merge this branch: | bzr merge lp://staging/unity-scopes-api/staging |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Henstridge | Approve | ||
|
Review via email:
|
|||
Commit message
* Deprecated push(Filters const&, FilterState const&) method.
* Fixed potential login deadlock in OnlineAccountCl
* Increased upper timeout limits to 60s to assist scope-harness testing on slow builders.
* Fixes for building with Florian Boucault's crossbuilder.
* Fixed incorrect generation of shlib files.
* Fixed Yakkety build by adding missing #includes.
* Fixed arm64 build by temporarily disabling SmartScopesClie
To post a comment you must log in.
Revision history for this message
| Michi Henning (michihenning) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Would be nice to get rid of this warning:
/home/michi/
Also, could we include https:/
This will be needed for the MIR.