Branch: refs/heads/merge_sle12_fix_test
Home: https://github.com/yast/yast-bootloader
Commit: 3d796d3a96aeda4ee10a3eaa91d3a5ad8d111def
https://github.com/yast/yast-bootloader/commit/3d796d3a96aeda4ee10a3eaa91d3a...
Author: Josef Reidinger
Date: 2014-10-08 (Wed, 08 Oct 2014)
Changed paths:
M package/yast2-bootloader.changes
M package/yast2-bootloader.spec
M src/include/bootloader/grub2/options.rb
Log Message:
-----------
Merge remote-tracking branch 'origin/SLE-12-GA' into merge_sle12_fix_test
Conflicts:
package/yast2-bootloader.changes
package/yast2-bootloader.spec
Commit: 5d5164d566b2e4bd211b9ae225ea0af883e86d61
https://github.com/yast/yast-bootloader/commit/5d5164d566b2e4bd211b9ae225ea0...
Author: Josef Reidinger
Date: 2014-10-08 (Wed, 08 Oct 2014)
Changed paths:
M test/device_mapping_test.rb
Log Message:
-----------
have test arch agnostic
Compare: https://github.com/yast/yast-bootloader/compare/3d796d3a96ae^...5d5164d566b2
