Branch: refs/heads/rubocop Home: https://github.com/yast/yast-installation Commit: 12bb57fd49ff89b47f1dcd33df2228c493261a66 https://github.com/yast/yast-installation/commit/12bb57fd49ff89b47f1dcd33df2... Author: Josef Reidinger <jreidinger@suse.cz> Date: 2015-01-12 (Mon, 12 Jan 2015) Changed paths: A .rubocop.yml M .travis.yml M Rakefile M control/complete_workflow.rb M control/inst_test_workflow.rb M src/clients/clone_finish.rb M src/clients/clone_proposal.rb M src/clients/copy_files_finish.rb M src/clients/copy_systemfiles_finish.rb M src/clients/deploy_image_auto.rb M src/clients/deploying_proposal.rb M src/clients/desktop_finish.rb M src/clients/driver_update1_finish.rb M src/clients/driver_update2_finish.rb M src/clients/inst_addon_update_sources.rb M src/clients/inst_ask_online_update.rb M src/clients/inst_check_autoinst_mode.rb M src/clients/inst_complex_welcome.rb M src/clients/inst_congratulate.rb M src/clients/inst_deploy_image.rb M src/clients/inst_disk_for_image.rb M src/clients/inst_disks_activate.rb M src/clients/inst_doit.rb M src/clients/inst_download_release_notes.rb M src/clients/inst_extrasources.rb M src/clients/inst_features.rb M src/clients/inst_finish.rb M src/clients/inst_info.rb M src/clients/inst_initialization.rb M src/clients/inst_installation_options.rb M src/clients/inst_license.rb M src/clients/inst_network_check.rb M src/clients/inst_new_desktop.rb M src/clients/inst_pre_install.rb M src/clients/inst_prepare_image.rb M src/clients/inst_prepareprogress.rb M src/clients/inst_proposal.rb M src/clients/inst_release_notes.rb M src/clients/inst_restore_settings.rb M src/clients/inst_save_hardware_status.rb M src/clients/inst_scenarios.rb M src/clients/inst_system_analysis.rb M src/clients/inst_upgrade_urls.rb M src/clients/inst_welcome.rb M src/clients/inst_worker_continue.rb M src/clients/inst_worker_initial.rb M src/clients/installation.rb M src/clients/installation_settings_finish.rb M src/clients/kernel_finish.rb M src/clients/ldconfig_finish.rb M src/clients/network_finish.rb M src/clients/proxy_finish.rb M src/clients/save_config_finish.rb M src/clients/save_hw_status_finish.rb M src/clients/ssh_settings_finish.rb M src/clients/stroj-casu.rb M src/clients/switch_scr_finish.rb M src/clients/test_inst_client.rb M src/clients/test_proposal.rb M src/clients/umount_finish.rb M src/clients/x11_finish.rb M src/clients/yast_inf_finish.rb M src/include/installation/inst_inc_all.rb M src/include/installation/inst_inc_first.rb M src/include/installation/inst_inc_second.rb M src/include/installation/misc.rb M src/lib/installation/cio_ignore.rb M src/lib/installation/minimal_installation.rb M src/lib/installation/prep_shrink.rb M src/lib/installation/remote_finish_client.rb M src/modules/ImageInstallation.rb M src/modules/InstData.rb M src/modules/InstFunctions.rb M src/modules/SystemFilesCopy.rb M src/modules/Vendor.rb M test/cio_ignore_test.rb M test/image_installation_test.rb M test/inst_functions_test.rb M test/prep_shrink_test.rb M test/remote_finish_test.rb Log Message: ----------- Merge branch 'SLE-12-GA' into rubocop Conflicts: .travis.yml Rakefile src/clients/clone_proposal.rb Commit: b1ff17003cd8337b0d063ff303cc796bf278b667 https://github.com/yast/yast-installation/commit/b1ff17003cd8337b0d063ff303c... Author: Josef Reidinger <jreidinger@suse.cz> Date: 2015-01-12 (Mon, 12 Jan 2015) Changed paths: M src/clients/clone_proposal.rb M src/include/installation/misc.rb M test/copy_logs_finish_test.rb Log Message: ----------- fix merge Compare: https://github.com/yast/yast-installation/compare/06fadc754cfb...b1ff17003cd...