[yast-commit] [yast/yast-yast2] 16a6ef: Merge remote-tracking branch 'origin/SLE-12-GA' in...

16 Jan 2015


      Branch: refs/heads/merge_SLE12
  Home:   https://github.com/yast/yast-yast2
  Commit: 16a6efff9f34181f585f5edeae2ae82799f579d6
      https://github.com/yast/yast-yast2/commit/16a6efff9f34181f585f5edeae2ae82799...
  Author: Josef Reidinger 
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    A .rubocop.yml
    M .travis.yml
    M Rakefile
    M doc/examples/ask_resize_windows_partition.rb
    M doc/examples/popups1.rb
    M doc/examples/popups2.rb
    M doc/examples/popups3.rb
    M library/commandline/src/clients/other_tools_warning.rb
    M library/commandline/src/modules/CommandLine.rb
    M library/commandline/testsuite/tests/cmdmap1.rb
    M library/commandline/testsuite/tests/cmdmap2.rb
    M library/commandline/testsuite/tests/cmdmap3.rb
    M library/commandline/testsuite/tests/cmdmap4.rb
    M library/commandline/testsuite/tests/cmdmap5.rb
    M library/commandline/testsuite/tests/cmdmap6.rb
    M library/commandline/testsuite/tests/command1.rb
    M library/commandline/testsuite/tests/command2.rb
    M library/commandline/testsuite/tests/command3.rb
    M library/commandline/testsuite/tests/command4.rb
    M library/commandline/testsuite/tests/command5.rb
    M library/commandline/testsuite/tests/command6.rb
    M library/commandline/testsuite/tests/command7.rb
    M library/commandline/testsuite/tests/help.rb
    M library/commandline/testsuite/tests/help1.rb
    M library/commandline/testsuite/tests/interactive1.rb
    M library/commandline/testsuite/tests/interactive2.rb
    M library/commandline/testsuite/tests/interactive3.rb
    M library/commandline/testsuite/tests/interactive4.rb
    M library/commandline/testsuite/tests/interactive5.rb
    M library/commandline/testsuite/tests/longhelp.rb
    M library/commandline/testsuite/tests/startgui1.rb
    M library/commandline/testsuite/tests/startgui2.rb
    M library/commandline/testsuite/tests/testsuitedata.rb
    M library/commandline/testsuite/tests/unique1.rb
    M library/control/src/modules/AutoinstData.rb
    M library/control/src/modules/DebugHooks.rb
    M library/control/src/modules/GetInstArgs.rb
    M library/control/src/modules/InstError.rb
    M library/control/src/modules/InstExtensionImage.rb
    M library/control/src/modules/Installation.rb
    M library/control/src/modules/ProductControl.rb
    M library/control/src/modules/ProductFeatures.rb
    M library/control/src/modules/ProductProfile.rb
    M library/control/src/modules/WorkflowManager.rb
    M library/control/testsuite/tests/PrepareProposals.rb
    M library/control/testsuite/tests/PrepareWorkflows.rb
    M library/control/testsuite/tests/ProductProfile.rb
    M library/control/testsuite/tests/WorkflowManager.rb
    M library/control/testsuite/tests/restore.rb
    M library/cron/src/modules/Cron.rb
    M library/cwm/src/modules/CWM.rb
    M library/cwm/src/modules/CWMServiceStart.rb
    M library/cwm/src/modules/CWMTab.rb
    M library/cwm/src/modules/CWMTable.rb
    M library/cwm/src/modules/CWMTsigKeys.rb
    M library/cwm/src/modules/DialogTree.rb
    M library/cwm/src/modules/TablePopup.rb
    M library/cwm/src/modules/WizardHW.rb
    M library/cwm/testsuite/tests/t1.rb
    M library/cwm/testsuite/tests/t2.rb
    M library/cwm/testsuite/tests/testfunc.rb
    M library/desktop/src/clients/menu.rb
    M library/desktop/src/modules/Desktop.rb
    M library/general/src/modules/Arch.rb
    M library/general/src/modules/AsciiFile.rb
    M library/general/src/modules/Assert.rb
    M library/general/src/modules/Call.rb
    M library/general/src/modules/ConfigHistory.rb
    M library/general/src/modules/ContextMenu.rb
    M library/general/src/modules/Crash.rb
    M library/general/src/modules/CustomDialogs.rb
    M library/general/src/modules/Directory.rb
    M library/general/src/modules/Distro.rb
    M library/general/src/modules/DontShowAgain.rb
    M library/general/src/modules/Encoding.rb
    M library/general/src/modules/Event.rb
    M library/general/src/modules/FileUtils.rb
    M library/general/src/modules/Hooks.rb
    M library/general/src/modules/Icon.rb
    M library/general/src/modules/Label.rb
    M library/general/src/modules/Linuxrc.rb
    M library/general/src/modules/MailAliases.rb
    M library/general/src/modules/Message.rb
    M library/general/src/modules/Misc.rb
    M library/general/src/modules/Mode.rb
    M library/general/src/modules/OSRelease.rb
    M library/general/src/modules/PackagesProposal.rb
    M library/general/src/modules/Popup.rb
    M library/general/src/modules/Report.rb
    M library/general/src/modules/Stage.rb
    M library/general/src/modules/Summary.rb
    M library/general/src/modules/Syslog.rb
    M library/general/src/modules/UIHelper.rb
    M library/general/src/modules/ValueBrowser.rb
    M library/general/src/modules/XVersion.rb
    M library/general/test/asciifile_test.rb
    M library/general/test/hooks_test.rb
    M library/general/test/linuxrc_test.rb
    M library/general/test/popup_test.rb
    M library/general/testsuite/tests/FileUtils.rb
    M library/gpg/Makefile.am
    M library/gpg/doc/example.rb
    M library/gpg/src/modules/GPG.rb
    M library/gpg/src/modules/GPGWidgets.rb
    R library/gpg/testsuite/Makefile.am
    M library/log/examples/logview4.rb
    M library/log/examples/logviewcore1.rb
    M library/log/examples/logviewcore2.rb
    M library/log/examples/logviewcore3.rb
    M library/log/src/modules/ALog.rb
    M library/log/src/modules/LogView.rb
    M library/log/src/modules/LogViewCore.rb
    M library/network/src/modules/CWMFirewallInterfaces.rb
    M library/network/src/modules/Internet.rb
    M library/network/src/modules/NetworkConfig.rb
    M library/network/src/modules/NetworkInterfaces.rb
    M library/network/src/modules/NetworkPopup.rb
    M library/network/src/modules/NetworkService.rb
    M library/network/src/modules/PortAliases.rb
    M library/network/src/modules/PortRanges.rb
    M library/network/src/modules/SuSEFirewall.rb
    M library/network/src/modules/SuSEFirewallExpertRules.rb
    M library/network/src/modules/SuSEFirewallProposal.rb
    M library/network/src/modules/SuSEFirewallServices.rb
    M library/network/test/load_ipv6_cfg_test.rb
    M library/network/test/network_interfaces_helpers_test.rb
    M library/network/test/network_service_test.rb
    M library/network/test/susefirewall_services_test.rb
    M library/network/testsuite/tests/NetworkInterfaces.rb
    M library/network/testsuite/tests/NetworkInterfaces2.rb
    M library/network/testsuite/tests/NetworkInterfaces3.rb
    M library/network/testsuite/tests/NetworkInterfaces4.rb
    M library/network/testsuite/tests/NetworkInterfaces5-Type.rb
    M library/network/testsuite/tests/PortAliases.rb
    M library/network/testsuite/tests/SuSEFirewall.rb
    M library/network/testsuite/tests/SuSEFirewallExpertRules.rb
    M library/packages/src/include/packages/common.rb
    M library/packages/src/modules/Package.rb
    M library/packages/src/modules/PackageAI.rb
    M library/packages/src/modules/PackageCallbacks.rb
    M library/packages/src/modules/PackageCallbacksInit.rb
    M library/packages/src/modules/PackageKit.rb
    M library/packages/src/modules/PackageLock.rb
    M library/packages/src/modules/PackageSystem.rb
    M library/packages/src/modules/PackagesUI.rb
    M library/packages/src/modules/Product.rb
    M library/packages/src/modules/SignatureCheckCallbacks.rb
    M library/packages/src/modules/SignatureCheckDialogs.rb
    M library/packages/src/modules/SlideShow.rb
    M library/packages/src/modules/Slides.rb
    M library/packages/test/product_test.rb
    M library/packages/test/signature_check_callbacks_test.rb
    M library/packages/test/slide_show_test.rb
    M library/packages/testsuite/packages-test.rb
    M library/runlevel/src/modules/Service.rb
    M library/runlevel/src/modules/ServicesProposal.rb
    M library/runlevel/src/modules/Systemd.rb
    M library/runlevel/test/service_test.rb
    M library/runlevel/test/services_proposal_test.rb
    M library/runlevel/test/test_helper.rb
    M library/runlevel/testsuite/tests/Systemd.rb
    M library/sequencer/doc/examples/examples.rb
    M library/sequencer/src/include/wizard/sequencer.rb
    M library/sequencer/src/modules/Sequencer.rb
    M library/sequencer/testsuite/tests/WS_alias.rb
    M library/sequencer/testsuite/tests/WS_check.rb
    M library/sequencer/testsuite/tests/WS_error.rb
    M library/sequencer/testsuite/tests/WS_next.rb
    M library/sequencer/testsuite/tests/WS_pop.rb
    M library/sequencer/testsuite/tests/WS_push.rb
    M library/sequencer/testsuite/tests/WS_run.rb
    M library/sequencer/testsuite/tests/WS_special.rb
    M library/sequencer/testsuite/tests/WS_testall.rb
    M library/sequencer/testsuite/tests/Wizard.rb
    M library/sequencer/testsuite/tests/Wizard0.rb
    M library/system/src/clients/view_anymsg.rb
    M library/system/src/include/hwinfo/classnames.rb
    M library/system/src/lib/yast2/hw_detection.rb
    M library/system/src/modules/FileChanges.rb
    M library/system/src/modules/HWConfig.rb
    M library/system/src/modules/Hotplug.rb
    M library/system/src/modules/HwStatus.rb
    M library/system/src/modules/Initrd.rb
    M library/system/src/modules/Kernel.rb
    M library/system/src/modules/ModuleLoading.rb
    M library/system/src/modules/ModulesConf.rb
    M library/system/test/hw_detection_test.rb
    M library/system/test/kernel_test.rb
    M library/system/test/proc_cmdline_test.rb
    M library/system/testsuite/tests/filechanges.rb
    M library/system/testsuite/tests/initrd.rb
    M library/system/testsuite/tests/kernel.rb
    M library/systemd/src/lib/yast2/systemctl.rb
    M library/systemd/src/lib/yast2/systemd_unit.rb
    M library/systemd/src/modules/systemd_service.rb
    M library/systemd/src/modules/systemd_socket.rb
    M library/systemd/src/modules/systemd_target.rb
    M library/systemd/test/systemctl_test.rb
    M library/systemd/test/systemd_service_test.rb
    M library/systemd/test/systemd_socket_test.rb
    M library/systemd/test/systemd_target_test.rb
    M library/systemd/test/systemd_unit_test.rb
    M library/systemd/test/test_helper.rb
    M library/types/src/modules/Address.rb
    M library/types/src/modules/Hostname.rb
    M library/types/src/modules/IP.rb
    M library/types/src/modules/Integer.rb
    M library/types/src/modules/Map.rb
    M library/types/src/modules/Netmask.rb
    M library/types/src/modules/Punycode.rb
    M library/types/src/modules/RichText.rb
    M library/types/src/modules/String.rb
    M library/types/src/modules/TypeRepository.rb
    M library/types/src/modules/URL.rb
    M library/types/src/modules/URLRecode.rb
    M library/types/test/ip_test.rb
    M library/types/test/ipv4_netmask_test.rb
    M library/types/testsuite/tests/Address.rb
    M library/types/testsuite/tests/FindMountPoint.rb
    M library/types/testsuite/tests/Hostname.rb
    M library/types/testsuite/tests/IP.rb
    M library/types/testsuite/tests/IPvalidation.rb
    M library/types/testsuite/tests/Integer.rb
    M library/types/testsuite/tests/Map.rb
    M library/types/testsuite/tests/Netmask.rb
    M library/types/testsuite/tests/String.rb
    M library/types/testsuite/tests/URL.rb
    M library/types/testsuite/tests/URLRecode.rb
    M library/types/testsuite/tests/enumtype.rb
    M library/types/testsuite/tests/isempty.rb
    M library/types/testsuite/tests/regextype.rb
    M library/types/testsuite/tests/undefinedtype.rb
    M library/wizard/doc/examples/progress_client1.rb
    M library/wizard/doc/examples/progress_client2.rb
    M library/wizard/doc/examples/progress_master.rb
    M library/wizard/doc/examples/progress_master_hidden.rb
    M library/wizard/doc/examples/progress_master_partlyhidden.rb
    M library/wizard/doc/examples/wizard-icon.rb
    M library/wizard/doc/examples/wizard1.rb
    M library/wizard/src/modules/Confirm.rb
    M library/wizard/src/modules/HTML.rb
    M library/wizard/src/modules/Progress.rb
    M library/wizard/src/modules/Wizard.rb
    M library/xml/src/modules/XML.rb
    M package/yast2.changes

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/SLE-12-GA' into merge_SLE12

Conflicts:
	.travis.yml
	Rakefile
	library/general/src/modules/Arch.rb
	library/general/test/agents_test/proc_meminfo_agent_test.rb
	library/general/test/test_helper.rb
	library/system/src/clients/view_anymsg.rb
	library/types/src/modules/IP.rb
	library/types/test/ip_test.rb
	package/yast2.changes


  Commit: d2a91dc0e2c8af8873d0eed0c4f99d2bfac7a08d
      https://github.com/yast/yast-yast2/commit/d2a91dc0e2c8af8873d0eed0c4f99d2bfa...
  Author: Josef Reidinger 
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M library/general/src/lib/installation/auto_client.rb
    M library/general/src/lib/installation/finish_client.rb
    M library/general/src/lib/installation/proposal_client.rb
    M library/general/src/lib/ui/event_dispatcher.rb
    M library/general/src/modules/Arch.rb
    M library/general/test/agents_test/netd_agent_test.rb
    M library/general/test/agents_test/proc_meminfo_agent_test.rb
    M library/general/test/auto_client_test.rb
    M library/general/test/event_dispatcher_test.rb
    M library/general/test/finish_client_test.rb
    M library/general/test/proposal_client_test.rb
    M library/general/test/test_helper.rb
    M library/system/src/clients/view_anymsg.rb
    M library/types/src/modules/IP.rb
    M library/types/test/ip_test.rb

  Log Message:
  -----------
  fix additional offenses after merge


Compare: https://github.com/yast/yast-yast2/compare/16a6efff9f34^...d2a91dc0e2c8

[yast-commit] [yast/yast-yast2] 16a6ef: Merge remote-tracking branch 'origin/SLE-12-GA' in...

GitHub