Branch: refs/heads/autoyast_do_not_overwrite_firewall_settings
Home: https://github.com/yast/yast-network
Commit: c99584fdd8140a2d7f295f81d246548704891c67
https://github.com/yast/yast-network/commit/c99584fdd8140a2d7f295f81d2465487...
Author: Martin Vidner
Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths:
A .travis.yml
M Rakefile
M package/yast2-network.changes
M package/yast2-network.spec
M src/include/network/lan/help.rb
M src/lib/network/install_inf_convertor.rb
M src/lib/network/network_autoconfiguration.rb
M src/modules/DNS.rb
M src/modules/Lan.rb
M src/modules/Routing.rb
A test/data/dhcp_hostname_false.xml
A test/data/dhcp_hostname_nil.xml
A test/data/dhcp_hostname_true.xml
M test/default_route_test.rb
A test/dns_test.rb
M test/ifroute_test.rb
M test/install_inf_convertor_test.rb
M test/lan_items_read_test.rb
M test/lan_test.rb
M test/network_autoconfiguration_test.rb
M test/new_device_startmode_test.rb
M test/routing_test.rb
Log Message:
-----------
Merge branch 'SLE-12-GA' into review_141001_autoyast_do_not_overwrite_firewall_settings
Conflicts:
package/yast2-network.changes
package/yast2-network.spec
