← Back to branch summary

~rodrigo-moya/ubuntuone-client/grey-hint-text

~rodrigo-moya/ubuntuone-client/grey-hint-text

Viewing all changes in revision 590.

Committer: Tarmac
Author(s): lucio.torre at gmail
Date: 2010-07-22 14:04:40 UTC
mfrom: (587.1.4 generations)
Revision ID: rodney.dawes@canonical.com-20100722140440-rjehb6nif1yq96op

Merge a lot of 'generations' changes into trunk.

files modified:
contrib/testing/testcase.py

tests/syncdaemon/test_action_queue.py

tests/syncdaemon/test_dbus.py

tests/syncdaemon/test_sync.py

tests/syncdaemon/test_vm.py

ubuntuone/syncdaemon/action_queue.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

contrib/testing/testcase.py

tests/syncdaemon/test_action_queue.py

tests/syncdaemon/test_dbus.py

tests/syncdaemon/test_sync.py

tests/syncdaemon/test_vm.py

ubuntuone/syncdaemon/action_queue.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 »