Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sle15 sp1 merge #124

Merged
merged 13 commits into from Apr 29, 2019
Merged

Sle15 sp1 merge #124

merged 13 commits into from Apr 29, 2019

Conversation

jreidinger
Copy link
Member

No description provided.

Copy link
Member

@lslezak lslezak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use the SP1 version?

@@ -17,7 +17,7 @@


Name: yast2-firewall
Version: 4.1.11
Version: 4.2.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the very same change as in the SP1 branch, right? Then we can keep the SP1 version, it should be changed only when doing TW or SP2 change not present in SP1...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but I modify spec, so spec is not same and I think in that case if htere is differ, we need to have different version, not?

@coveralls
Copy link

Coverage Status

Coverage decreased (-1.03%) to 87.997% when pulling aa191df on sle15-sp1-merge into 2d5597c on master.

@@ -38,6 +38,8 @@ Requires: yast2 >= 4.1.67

# ButtonBox widget
Conflicts: yast2-ycp-ui-bindings < 2.17.3
# CpiMitigations
Conflicts: yast2-bootloader < 4.2.1
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is different to SP1 version as in TW bootloader version is higher.

Copy link
Member

@lslezak lslezak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see, so the change is the same, we just depend on an already SP2 version of the bootloader package...

@jreidinger jreidinger merged commit f70be1e into master Apr 29, 2019
@jreidinger jreidinger deleted the sle15-sp1-merge branch April 29, 2019 14:06
@yast-bot
Copy link
Contributor

✔️ Public Jenkins job #26 successfully finished
✔️ Created OBS submit request #699444

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants