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

Merge SLE 12 SP1 into master #18

Merged
merged 15 commits into from Jan 14, 2016
Merged

Merge SLE 12 SP1 into master #18

merged 15 commits into from Jan 14, 2016

Conversation

imobachgs
Copy link
Contributor

Merge SLE-12-SP1 branch into master.

imobachgs and others added 15 commits July 30, 2015 10:48
Fix package version because it diverges from master
…fig-handling-sle12-sp1

* upstream/SLE-12-GA:
  Replaces regexp tests by SCR ones
  Substitute 'strip' for 'chomp' in scr_parse_test
  Add tests to check that the regexp used in the parser works
  Bump version and update changes file
  Fix handling of config files affected by bsc#878892
  Add basic RSpec tests for SlpServer module
  Fix package version because it diverges from master
@ancorgs
Copy link
Contributor

ancorgs commented Jan 14, 2016

LGTM

@imobachgs
Copy link
Contributor Author

Thanks!

imobachgs added a commit that referenced this pull request Jan 14, 2016
@imobachgs imobachgs merged commit 0921c6a into yast:master Jan 14, 2016
@imobachgs imobachgs deleted the merge-sle-12-sp1-into-master branch January 14, 2016 11:52
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

2 participants