lp:~ken-vandine/content-hub/quiet_logging

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:content-hub at revision 77

Michael Sheldon (community): Approve on 2014-03-19

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

Diff: 2281 lines (+378/-245)

32 files modified

CMakeLists.txt (+2/-0)
debian/changelog (+10/-0)
import/Ubuntu/Content/CMakeLists.txt (+1/-0)
import/Ubuntu/Content/contenthandler.cpp (+2/-3)
import/Ubuntu/Content/contenthub.cpp (+18/-12)
import/Ubuntu/Content/contenthubplugin.cpp (+4/-3)
import/Ubuntu/Content/contenticonprovider.cpp (+4/-5)
import/Ubuntu/Content/contentitem.cpp (+8/-9)
import/Ubuntu/Content/contentpeer.cpp (+16/-16)
import/Ubuntu/Content/contentpeermodel.cpp (+9/-10)
import/Ubuntu/Content/contentscope.cpp (+3/-4)
import/Ubuntu/Content/contentstore.cpp (+8/-9)
import/Ubuntu/Content/contenttransfer.cpp (+21/-22)
import/Ubuntu/Content/contenttype.cpp (+3/-4)
import/Ubuntu/Content/qmlimportexporthandler.cpp (+5/-6)
src/com/ubuntu/content/CMakeLists.txt (+1/-0)
src/com/ubuntu/content/debug.cpp (+26/-0)
src/com/ubuntu/content/debug.h (+53/-0)
src/com/ubuntu/content/detail/app_manager.cpp (+3/-3)
src/com/ubuntu/content/detail/handler.cpp (+9/-9)
src/com/ubuntu/content/detail/service.cpp (+63/-55)
src/com/ubuntu/content/detail/transfer.cpp (+21/-22)
src/com/ubuntu/content/hub.cpp (+17/-6)
src/com/ubuntu/content/peer.cpp (+4/-4)
src/com/ubuntu/content/service/CMakeLists.txt (+1/-0)
src/com/ubuntu/content/service/helper.cpp (+12/-1)
src/com/ubuntu/content/service/hook.cpp (+7/-7)
src/com/ubuntu/content/service/main.cpp (+15/-4)
src/com/ubuntu/content/service/registry.cpp (+21/-20)
src/com/ubuntu/content/service/registry.h (+0/-1)
src/com/ubuntu/content/transfer.cpp (+1/-1)
src/com/ubuntu/content/utils.cpp (+10/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

141. By Ken VanDine on 2014-03-21

merged fix_pending_check

140. By Ken VanDine on 2014-03-20

merged peer_picker_ui

139. By Ken VanDine on 2014-03-19

merged trunk

138. By Ken VanDine on 2014-03-18

merged from latest peer_picker_ui branch

137. By Ken VanDine on 2014-03-07

Merge qml-test fixes

136. By Ken VanDine on 2014-03-07

Merged

135. By Ken VanDine on 2014-03-07

Fixes for the merged changes to defaults

134. By Ken VanDine on 2014-03-06

* Added Type::Known::contacts. Note: there is no associated default
  store for contacts under any scope. Data for contacts doesn't
  persist.
* Changed defaults to a triplet used to build the appid. Bumped build
  depends for libupstart-app-launch2-dev needed for converting the
  triplet to an appid.

133. By Ken VanDine on 2014-03-06

merged peer_picker_ui branch

132. By Ken VanDine on 2014-03-05

added missing include