← Back to branch summary

~tcole/ubuntuone-client/request-queue-predicates

~tcole/ubuntuone-client/request-queue-predicates

Viewing all changes in revision 166.

Committer: tim.cole at canonical
Date: 2009-08-24 16:12:45 UTC
mfrom: (160.2.13 trunk)
Revision ID: tim.cole@canonical.com-20090824161245-ahpdrhyf5thnvcrj

merge from trunk

files modified:
bin/ubuntuone-client-applet

bin/ubuntuone-syncdaemon

contrib/testing/testcase.py

data/syncdaemon.conf

tests/syncdaemon/test_dbus.py

tests/syncdaemon/test_main.py

tests/syncdaemon/test_vm.py

ubuntuone/syncdaemon/action_queue.py

ubuntuone/syncdaemon/dbus_interface.py

ubuntuone/syncdaemon/event_queue.py

ubuntuone/syncdaemon/main.py

ubuntuone/syncdaemon/sync.py

ubuntuone/syncdaemon/u1fsfsm.ods

ubuntuone/syncdaemon/u1fsfsm.py

ubuntuone/syncdaemon/volume_manager.py

Show diffs side-by-side

added added

removed removed

bin/ubuntuone-client-applet

bin/ubuntuone-syncdaemon

contrib/testing/testcase.py

data/syncdaemon.conf

tests/syncdaemon/test_dbus.py

tests/syncdaemon/test_main.py

tests/syncdaemon/test_vm.py

ubuntuone/syncdaemon/action_queue.py

ubuntuone/syncdaemon/dbus_interface.py

ubuntuone/syncdaemon/event_queue.py

ubuntuone/syncdaemon/main.py

ubuntuone/syncdaemon/sync.py

ubuntuone/syncdaemon/u1fsfsm.ods

ubuntuone/syncdaemon/u1fsfsm.py

ubuntuone/syncdaemon/volume_manager.py

Older »