Merges branch 'master' into service_client_merge
authorStefan Schubert <schubi@suse.de>
Fri, 8 Jul 2011 14:00:28 +0000 (16:00 +0200)
committerStefan Schubert <schubi@suse.de>
Fri, 8 Jul 2011 14:00:28 +0000 (16:00 +0200)
commit8144d94b3982a51b8a6276fd336e26600f1923b6
tree45c38d7a390530d27336c77107f50994884ebb11
parentcc41c827fab578ef188209090f22d5abf2085444
parent4e737144fd4cf7c18a6b42dada28f3745536de8d
Merges branch 'master' into service_client_merge

Conflicts:
plugins/basesystem/app/models/basesystem.rb
plugins/basesystem/package/basesystem.yml
plugins/basesystem/package/webyast-firstboot-ws.changes
plugins/basesystem/package/webyast-firstboot-ws.spec
plugins/basesystem/test/unit/basesystem_test.rb
plugins/firewall/app/models/firewall.rb
plugins/software/package/webyast-software-ws.spec
webservice/app/controllers/application_controller.rb
webservice/vendor/plugins/delayed_job/lib/tasks/jobs.rake
webservice/vendor/plugins/delayed_job/lib/tasks/tasks.rb
webservice/vendor/plugins/delayed_job/tasks/jobs.rake
webservice/vendor/plugins/delayed_job/tasks/tasks.rb
webyast/package/nginx.conf
webyast/package/webyast-base.spec
webyast/vendor/plugins/delayed_job/tasks/jobs.rake
webyast/vendor/plugins/delayed_job/tasks/tasks.rb
webyast/vendor/plugins/static_record_cache/MIT-LICENSE
webyast/vendor/plugins/static_record_cache/README.rdoc
webyast/vendor/plugins/static_record_cache/Rakefile
webyast/vendor/plugins/static_record_cache/VERSION
webyast/vendor/plugins/static_record_cache/init.rb
webyast/vendor/plugins/static_record_cache/lib/acts_as_static_record.rb
webyast/vendor/plugins/static_record_cache/lib/static_active_record_context.rb
webyast/vendor/plugins/static_record_cache/lib/static_record_cache.rb
webyast/vendor/plugins/static_record_cache/static_record_cache.gemspec
webyast/vendor/plugins/static_record_cache/tasks/static_record_cache_tasks.rake
webyast/vendor/plugins/static_record_cache/test/acts_as_static_record_test.rb
webyast/vendor/plugins/static_record_cache/test/db/schema.rb
webyast/vendor/plugins/static_record_cache/test/fixtures/carriers.yml
webyast/vendor/plugins/static_record_cache/test/fixtures/phone_numbers.yml
webyast/vendor/plugins/static_record_cache/test/models/carrier.rb
webyast/vendor/plugins/static_record_cache/test/models/context_carrier.rb
webyast/vendor/plugins/static_record_cache/test/models/phone_number.rb
webyast/vendor/plugins/static_record_cache/test/static_active_record_context_test.rb
webyast/vendor/plugins/static_record_cache/test/test_helper.rb
20 files changed:
plugins/administrator/app/models/administrator.rb
plugins/firewall/app/models/firewall.rb
plugins/mail/app/models/mail.rb
plugins/software/package/webyast-software-ws.spec
webyast-tasks/VERSION
webyast-tasks/lib/tasks/osc_build.rake
webyast-tasks/package/rubygem-webyast-rake-tasks.changes
webyast/app/controllers/application_controller.rb
webyast/app/controllers/notifier_controller.rb
webyast/app/models/account.rb
webyast/app/models/data_cache.rb
webyast/app/models/permission.rb
webyast/app/models/resource.rb
webyast/config/environment.rb
webyast/lib/plugin_job.rb
webyast/lib/yast_cache.rb
webyast/package/nginx.conf
webyast/package/webyast-base.changes
webyast/package/webyast-base.spec
webyast/test/unit/resource_test.rb