Branch: refs/heads/Code-11-SP4 Home: https://github.com/yast/yast-network Commit: 51fc202d040cce009b7bc7f6aa41b56de9380fb6 https://github.com/yast/yast-network/commit/51fc202d040cce009b7bc7f6aa41b56d... Author: Michal Filka <mfilka@suse.cz> Date: 2015-05-13 (Wed, 13 May 2015) Changed paths: M src/clients/lan_auto.ycp Log Message: ----------- Formatting, dropped useless comments Commit: 6ee9f8535ba1af5970ec00193204592a6f3ec2cf https://github.com/yast/yast-network/commit/6ee9f8535ba1af5970ec00193204592a... Author: Michal Filka <mfilka@suse.cz> Date: 2015-05-13 (Wed, 13 May 2015) Changed paths: M src/clients/lan_auto.ycp Log Message: ----------- Merge AY ifcfg configs with instsys ones when requested. bnc#874259 It means in case when keep_install_network is explicitly set in AY profile. Commit: 959b52ae02f9c6eb2b7e048a8165c4c5685715fa https://github.com/yast/yast-network/commit/959b52ae02f9c6eb2b7e048a8165c4c5... Author: Michal Filka <mfilka@suse.cz> Date: 2015-05-13 (Wed, 13 May 2015) Changed paths: M VERSION M package/yast2-network.changes Log Message: ----------- Updated changelog Commit: 13127c5925739af741611cc85f49ed33c0ffd5f2 https://github.com/yast/yast-network/commit/13127c5925739af741611cc85f49ed33... Author: mchf <mfilka@suse.cz> Date: 2015-05-13 (Wed, 13 May 2015) Changed paths: M VERSION M package/yast2-network.changes M src/clients/lan_auto.ycp Log Message: ----------- Merge pull request #296 from mchf/debugging-OES Keep ifcfgs provided via linuxrc when keep_install_network is set in AY profile Commit: 572cf56769ac6830ff68c3776a9832910e7f5adb https://github.com/yast/yast-network/commit/572cf56769ac6830ff68c3776a983291... Author: Michal Filka <mfilka@suse.cz> Date: 2015-05-13 (Wed, 13 May 2015) Changed paths: M VERSION M package/yast2-network.changes M src/clients/lan_auto.ycp Log Message: ----------- Merge branch 'Code-11-SP3' into Code-11-SP4 Conflicts: VERSION package/yast2-network.changes Commit: 32cce09133bbadfa6fa8b4fcc181da2b7d82ddd5 https://github.com/yast/yast-network/commit/32cce09133bbadfa6fa8b4fcc181da2b... Author: Michal Filka <mfilka@suse.cz> Date: 2015-05-13 (Wed, 13 May 2015) Changed paths: M VERSION M package/yast2-network.changes M src/modules/Proxy.ycp A testsuite/tests/ProxyWrite.err A testsuite/tests/ProxyWrite.out A testsuite/tests/ProxyWrite.ycp Log Message: ----------- Merge remote-tracking branch 'upstream/Code-11-SP4' into Code-11-SP4 Conflicts: package/yast2-network.changes Commit: 1d902215fa60c1ccd39ba7f6981d28ccd0a3ec86 https://github.com/yast/yast-network/commit/1d902215fa60c1ccd39ba7f6981d28cc... Author: mchf <mfilka@suse.cz> Date: 2015-05-13 (Wed, 13 May 2015) Changed paths: M VERSION M package/yast2-network.changes M src/clients/lan_auto.ycp Log Message: ----------- Merge pull request #297 from mchf/Code-11-SP4 Merge latest changes from Code-11-SP3 into Code-11-SP4 Compare: https://github.com/yast/yast-network/compare/473039c41029...1d902215fa60