Branch: refs/heads/fix_killing
Home: https://github.com/yast/yast-yast2
Commit: c95bc3a53ea458847a1e7eceea0e646bc7d2920c
https://github.com/yast/yast-yast2/commit/c95bc3a53ea458847a1e7eceea0e646bc7...
Author: Josef Reidinger
Date: 2015-01-27 (Tue, 27 Jan 2015)
Changed paths:
M library/general/test/agents_test/netd_agent_test.rb
M library/general/test/agents_test/proc_meminfo_agent_test.rb
A library/general/test/scr_stub.rb
M library/general/test/test_helper.rb
M library/packages/src/modules/PackageCallbacks.rb
M library/runlevel/test/service_test.rb
M library/system/test/hw_detection_test.rb
M library/system/test/kernel_test.rb
M library/system/test/proc_cmdline_test.rb
A library/system/test/test_helper.rb
M library/types/src/modules/String.rb
M package/yast2.changes
Log Message:
-----------
Merge remote-tracking branch 'origin/SLE-12-GA' into fix_killing
Conflicts:
library/general/test/agents_test/netd_agent_test.rb
library/general/test/agents_test/proc_meminfo_agent_test.rb
library/general/test/test_helper.rb
library/types/src/modules/String.rb
package/yast2.changes
GitHub