← Back to branch summary

~radix/landscape-client/reactor-refactor-2

~radix/landscape-client/reactor-refactor-2

Viewing all changes in revision 682.

Committer: Christopher Armstrong
Date: 2013-05-16 17:16:10 UTC
mfrom: (675.1.3 landscape-client)
Revision ID: christopher.armstrong@canonical.com-20130516171610-tju4rbkksh7m73lh

merge from trunk

files removed:
landscape/hal.py

landscape/monitor/hardwareinventory.py

landscape/monitor/tests/test_hardwareinventory.py

landscape/tests/test_hal.py

files modified:
landscape/amp.py

landscape/broker/amp.py

landscape/broker/server.py

landscape/lib/disk.py

landscape/lib/tests/test_disk.py

landscape/monitor/config.py

landscape/monitor/mountinfo.py

landscape/monitor/tests/test_mountinfo.py

scripts/landscape-dbus-proxy

Show diffs side-by-side

added added

removed removed

landscape/amp.py

landscape/broker/amp.py

landscape/broker/server.py

landscape/hal.py

landscape/lib/disk.py

landscape/lib/tests/test_disk.py

landscape/monitor/config.py

landscape/monitor/hardwareinventory.py

landscape/monitor/mountinfo.py

landscape/monitor/tests/test_hardwareinventory.py

landscape/monitor/tests/test_mountinfo.py

landscape/tests/test_hal.py

scripts/landscape-dbus-proxy

Older »