Merge branch 'maintenance-webyast-1.0' of gitorious.org:opensuse/yast-rest-service
authorJosef Reidinger <jreidinger@suse.cz>
Wed, 14 Jul 2010 09:39:46 +0000 (11:39 +0200)
committerJosef Reidinger <jreidinger@suse.cz>
Wed, 14 Jul 2010 09:39:46 +0000 (11:39 +0200)
commitdf80398613a26d000529d1d71e610e386fdb9c0b
treea0f8bd07fcf19c97ed13057b361bdbba92b1f97e
parentc92f6a4c93918b8d744c988cfa0b34619cb20844
parent2f073c23e1c0134ecddfe2d6c1e7cc68336f6d39
Merge branch 'maintenance-webyast-1.0' of gitorious.org:opensuse/yast-rest-service

TODO: properly add test which is missing in 1.0

Conflicts:
plugins/ntp/package/NTP.pm
plugins/ntp/package/yast2-webservice-ntp.changes
plugins/ntp/package/yast2-webservice-ntp.spec
plugins/patches/app/models/patch.rb
plugins/patches/app/models/resolvable.rb
plugins/patches/package/yast2-webservice-patches.changes
plugins/patches/package/yast2-webservice-patches.spec
plugins/software/app/controllers/patches_controller.rb
webservice/lib/background_manager.rb
webservice/package/yast2-webservice.changes
webservice/package/yast2-webservice.spec
plugins/software/app/controllers/patches_controller.rb
plugins/software/app/models/patch.rb
plugins/software/lib/packagekit.rb
plugins/software/scripts/install_patches.rb
webservice/lib/background_manager.rb