Merge lp://staging/~nataliabidart/magicicada-client/magicicadaclient-namespace into lp://staging/magicicada-client

bin/u1sdtool (+3/-2)
bin/ubuntuone-launch (+5/-7)
bin/ubuntuone-syncdaemon (+11/-19)
contrib/__init__.py (+1/-2)
contrib/dbus-docs (+9/-11)
contrib/dbus_util.py (+2/-1)
contrib/draw-fsm (+3/-2)
contrib/dump_metadata.py (+21/-17)
magicicadaclient/keyring.py (+3/-3)
magicicadaclient/networkstate/__init__.py (+3/-3)
magicicadaclient/networkstate/darwin.py (+2/-2)
magicicadaclient/networkstate/linux.py (+2/-2)
magicicadaclient/networkstate/tests/test_darwin.py (+4/-4)
magicicadaclient/networkstate/tests/test_linux.py (+4/-4)
magicicadaclient/networkstate/tests/test_windows.py (+3/-3)
magicicadaclient/networkstate/windows.py (+2/-2)
magicicadaclient/platform/__init__.py (+3/-3)
magicicadaclient/platform/filesystem_notifications/__init__.py (+1/-1)
magicicadaclient/platform/filesystem_notifications/monitor/__init__.py (+4/-4)
magicicadaclient/platform/filesystem_notifications/monitor/common.py (+6/-6)
magicicadaclient/platform/filesystem_notifications/monitor/darwin/__init__.py (+1/-1)
magicicadaclient/platform/filesystem_notifications/monitor/darwin/fsevents_client.py (+1/-1)
magicicadaclient/platform/filesystem_notifications/monitor/darwin/fsevents_daemon.py (+5/-5)
magicicadaclient/platform/filesystem_notifications/monitor/linux.py (+2/-2)
magicicadaclient/platform/filesystem_notifications/monitor/windows.py (+2/-2)
magicicadaclient/platform/filesystem_notifications/notify_processor/__init__.py (+2/-2)
magicicadaclient/platform/filesystem_notifications/notify_processor/common.py (+3/-3)
magicicadaclient/platform/filesystem_notifications/notify_processor/linux.py (+1/-1)
magicicadaclient/platform/ipc/__init__.py (+2/-2)
magicicadaclient/platform/ipc/ipc_client.py (+1/-1)
magicicadaclient/platform/ipc/linux.py (+1/-1)
magicicadaclient/platform/ipc/perspective_broker.py (+4/-4)
magicicadaclient/platform/launcher/__init__.py (+2/-2)
magicicadaclient/platform/launcher/linux.py (+1/-1)
magicicadaclient/platform/launcher/windows.py (+1/-1)
magicicadaclient/platform/logger/__init__.py (+3/-3)
magicicadaclient/platform/os_helper/__init__.py (+3/-3)
magicicadaclient/platform/os_helper/darwin.py (+2/-2)
magicicadaclient/platform/os_helper/linux.py (+1/-1)
magicicadaclient/platform/session/__init__.py (+3/-3)
magicicadaclient/platform/session/linux.py (+1/-1)
magicicadaclient/platform/tests/__init__.py (+2/-2)
magicicadaclient/platform/tests/filesystem_notifications/__init__.py (+3/-3)
magicicadaclient/platform/tests/filesystem_notifications/common.py (+6/-6)
magicicadaclient/platform/tests/filesystem_notifications/test_darwin.py (+7/-7)
magicicadaclient/platform/tests/filesystem_notifications/test_filesystem_notifications.py (+5/-5)
magicicadaclient/platform/tests/filesystem_notifications/test_fsevents_daemon.py (+4/-4)
magicicadaclient/platform/tests/filesystem_notifications/test_linux.py (+5/-5)
magicicadaclient/platform/tests/filesystem_notifications/test_pyinotify_agnostic.py (+1/-1)
magicicadaclient/platform/tests/filesystem_notifications/test_windows.py (+5/-5)
magicicadaclient/platform/tests/ipc/test_external_interface.py (+1/-1)
magicicadaclient/platform/tests/ipc/test_linux.py (+4/-4)
magicicadaclient/platform/tests/ipc/test_perspective_broker.py (+8/-8)
magicicadaclient/platform/tests/ipc/test_unix.py (+1/-1)
magicicadaclient/platform/tests/ipc/test_windows.py (+1/-1)
magicicadaclient/platform/tests/launcher/test_linux.py (+5/-8)
magicicadaclient/platform/tests/linux/test_vm.py (+3/-3)
magicicadaclient/platform/tests/os_helper/test_darwin.py (+3/-3)
magicicadaclient/platform/tests/os_helper/test_linux.py (+3/-3)
magicicadaclient/platform/tests/os_helper/test_os_helper.py (+2/-2)
magicicadaclient/platform/tests/os_helper/test_windows.py (+4/-4)
magicicadaclient/platform/tests/session/test_common.py (+1/-1)
magicicadaclient/platform/tests/session/test_linux.py (+1/-1)
magicicadaclient/platform/tests/test_logger.py (+2/-3)
magicicadaclient/platform/tests/test_platform.py (+1/-1)
magicicadaclient/platform/tests/test_tools.py (+4/-4)
magicicadaclient/platform/tests/test_u1sdtool.py (+5/-5)
magicicadaclient/platform/tests/tools/test_tools.py (+1/-1)
magicicadaclient/platform/tests/windows/run_sdtool.py (+1/-1)
magicicadaclient/platform/tools/__init__.py (+3/-3)
magicicadaclient/platform/tools/linux.py (+1/-1)
magicicadaclient/platform/tools/perspective_broker.py (+4/-4)
magicicadaclient/syncdaemon/action_queue.py (+5/-5)
magicicadaclient/syncdaemon/config.py (+2/-2)
magicicadaclient/syncdaemon/event_queue.py (+2/-2)
magicicadaclient/syncdaemon/file_shelf.py (+1/-1)
magicicadaclient/syncdaemon/filesystem_manager.py (+8/-8)
magicicadaclient/syncdaemon/filesystem_notifications.py (+3/-3)
magicicadaclient/syncdaemon/fsm/fsm.py (+2/-2)
magicicadaclient/syncdaemon/hash_queue.py (+2/-2)
magicicadaclient/syncdaemon/interaction_interfaces.py (+8/-8)
magicicadaclient/syncdaemon/local_rescan.py (+5/-5)
magicicadaclient/syncdaemon/logger.py (+4/-4)
magicicadaclient/syncdaemon/main.py (+4/-4)
magicicadaclient/syncdaemon/marker.py (+1/-1)
magicicadaclient/syncdaemon/sync.py (+7/-7)
magicicadaclient/syncdaemon/tests/fsm/test_fsm.py (+1/-1)
magicicadaclient/syncdaemon/tests/fsm/test_fsm_run.py (+1/-1)
magicicadaclient/syncdaemon/tests/test_action_queue.py (+10/-10)
magicicadaclient/syncdaemon/tests/test_config.py (+4/-4)
magicicadaclient/syncdaemon/tests/test_eq_inotify.py (+4/-4)
magicicadaclient/syncdaemon/tests/test_eventqueue.py (+3/-3)
magicicadaclient/syncdaemon/tests/test_eventsnanny.py (+2/-2)
magicicadaclient/syncdaemon/tests/test_fileshelf.py (+3/-3)
magicicadaclient/syncdaemon/tests/test_fsm.py (+13/-13)
magicicadaclient/syncdaemon/tests/test_hashqueue.py (+4/-4)
magicicadaclient/syncdaemon/tests/test_interaction_interfaces.py (+8/-8)
magicicadaclient/syncdaemon/tests/test_localrescan.py (+6/-6)
magicicadaclient/syncdaemon/tests/test_logger.py (+1/-1)
magicicadaclient/syncdaemon/tests/test_main.py (+6/-6)
magicicadaclient/syncdaemon/tests/test_mutefilter.py (+1/-1)
magicicadaclient/syncdaemon/tests/test_offloadqueue.py (+3/-3)
magicicadaclient/syncdaemon/tests/test_pathlockingtree.py (+1/-1)
magicicadaclient/syncdaemon/tests/test_states.py (+3/-3)
magicicadaclient/syncdaemon/tests/test_sync.py (+9/-9)
magicicadaclient/syncdaemon/tests/test_tritcask.py (+3/-3)
magicicadaclient/syncdaemon/tests/test_u1fsfsm.py (+1/-1)
magicicadaclient/syncdaemon/tests/test_utils.py (+13/-13)
magicicadaclient/syncdaemon/tests/test_vm.py (+8/-8)
magicicadaclient/syncdaemon/tests/test_vm_helper.py (+5/-5)
magicicadaclient/syncdaemon/tritcask.py (+1/-1)
magicicadaclient/syncdaemon/vm_helper.py (+3/-3)
magicicadaclient/syncdaemon/volume_manager.py (+13/-13)
magicicadaclient/testing/testcase.py (+4/-4)
magicicadaclient/tests/test_keyring.py (+1/-1)
magicicadaclient/utils/ipc.py (+1/-1)
magicicadaclient/utils/tests/test_common.py (+2/-2)
magicicadaclient/utils/tests/test_ipc.py (+2/-2)
magicicadaclient/utils/tests/test_locale.py (+1/-1)
magicicadaclient/utils/tests/test_tcpactivation.py (+2/-2)
magicicadaclient/utils/tests/test_translation.py (+4/-4)
magicicadaclient/utils/tests/test_txsecrets.py (+1/-1)
run-tests (+3/-3)
ubuntuone-client.pth (+0/-1)