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 SP2 into master #203

Merged
merged 4 commits into from
Nov 11, 2016
Merged

Merge SLE 12 SP2 into master #203

merged 4 commits into from
Nov 11, 2016

Conversation

imobachgs
Copy link
Contributor

Some conflicts where fixed.

imobachgs and others added 2 commits November 9, 2016 16:38
@imobachgs
SLE 12 SP2 merge (#202)
92ff4ec 
* prevent double URL encode for ISO (bnc#954813)
@imobachgs
Merge remote-tracking branch 'origin/SLE-12-SP2' into merge-sle-12-sp…
9cc2fa7 
…2-into-master

* origin/SLE-12-SP2:
  SLE 12 SP2 merge (#202)
@imobachgs imobachgs changed the title Merge SLE 12 SP2 into master [WIP] Merge SLE 12 SP2 into master Nov 10, 2016
@imobachgs imobachgs changed the title [WIP] Merge SLE 12 SP2 into master Merge SLE 12 SP2 into master Nov 11, 2016
@jreidinger
Copy link
Member

LGTM

@imobachgs
Copy link
Contributor Author

Oh, I added the cheetah and abstract_methods in the wrong place. Fixing.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 35.671% when pulling 3746076 on merge-sle-12-sp2-into-master into adf23b5 on master.

@jreidinger
Copy link
Member

still LGTM

@imobachgs
Copy link
Contributor Author

Thanks!

@imobachgs imobachgs merged commit 7f793e0 into master Nov 11, 2016
@imobachgs imobachgs deleted the merge-sle-12-sp2-into-master branch November 11, 2016 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
3 participants
@imobachgs @jreidinger @coveralls