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.

Sign up for GitHub

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

Jump to bottom

Merge SLE-12-SP5 #145

Merged
merged 12 commits into from
Aug 19, 2019
Merged

Merge SLE-12-SP5 #145

merged 12 commits into from
Aug 19, 2019

Conversation

joseivanlopez
Copy link
Contributor

Synchronizing branches, see #144

dgdavid and others added 12 commits July 19, 2019 13:17
@dgdavid
adapt Rakefile and Dockerfile for SLE-12-SP5
35264e3
@aschnell
Fixed saving /etc/ntp.conf with certain comments (bsc#1142026)
17af584
@shundhammer
Merge pull request #143 from aschnell/bsc1142026
770c44c
@joseivanlopez
Remove blank lines when sanitizing comments
c3ae2e5
@joseivanlopez
Do not modify values when saving
3297392
@joseivanlopez
Updates version and changelog
d17b153
@joseivanlopez
Merge pull request #144 from yast/sanitize_comments
e656cd9 
AutoYaST: sanitize comments when importing
@joseivanlopez
Revert "adapt Rakefile and Dockerfile for SLE-12-SP5"
258cd0a 
This reverts commit 35264e3.
@joseivanlopez
Revert "Updates version and changelog"
1984c2e 
This reverts commit d17b153.
@joseivanlopez
Revert "Do not modify values when saving"
fa0e047 
This reverts commit 3297392.
@joseivanlopez
Revert "Remove blank lines when sanitizing comments"
4b2723a 
This reverts commit c3ae2e5.
@joseivanlopez
Revert "Fixed saving /etc/ntp.conf with certain comments (bsc#1142026)"
582acc1 
This reverts commit 17af584.
@coveralls
Copy link

Coverage Status

Coverage remained the same at 54.944% when pulling 582acc1 on sle12sp5_revert into 7403d8d on SLE-15-GA.

@joseivanlopez joseivanlopez merged commit 40ff4b3 into SLE-15-GA Aug 19, 2019
@shundhammer shundhammer deleted the sle12sp5_revert branch February 24, 2022 12:13
@shundhammer shundhammer restored the sle12sp5_revert branch February 24, 2022 12:13
@shundhammer shundhammer deleted the sle12sp5_revert branch February 24, 2022 12:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dgdavid dgdavid dgdavid approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@joseivanlopez @coveralls @dgdavid @aschnell @shundhammer