Branch: refs/heads/caasp_merge Home: https://github.com/yast/yast-yast2 Commit: a3b0b2973d39fa48ad377614bc780093bbdfc79a https://github.com/yast/yast-yast2/commit/a3b0b2973d39fa48ad377614bc780093bb... Author: Josef Reidinger Date: 2017-08-07 (Mon, 07 Aug 2017) Changed paths: M Rakefile A library/cwm/examples/replace_point_example.rb M library/cwm/src/lib/cwm/widget.rb M library/cwm/src/modules/CWM.rb M library/cwm/test/widgets_test.rb M library/general/src/Makefile.am M library/general/src/lib/installation/proposal_client.rb A library/general/src/lib/ui/widgets.rb M library/general/test/Makefile.am A library/general/test/widgets_test.rb M library/network/src/modules/NetworkService.rb M library/runlevel/src/modules/Service.rb M package/yast2.changes M package/yast2.spec Log Message: ----------- Merge remote-tracking branch 'origin/SLE-12-SP2-CASP' into caasp_merge Commit: 23df941bcafdaac722854c5d78df2bab1fcdf2cd https://github.com/yast/yast-yast2/commit/23df941bcafdaac722854c5d78df2bab1f... Author: Josef Reidinger Date: 2017-08-07 (Mon, 07 Aug 2017) Changed paths: M Rakefile M package/yast2.spec Log Message: ----------- Revert "fix Rakefile" This reverts commit b03c6ad007d902aabc878531affbb8d23060c200. Compare: https://github.com/yast/yast-yast2/compare/a3b0b2973d39^...23df941bcafd