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

Cleaning up @since TODO / @since XXX #2578

Merged
merged 1 commit into from Oct 16, 2016

Conversation

4 participants
@daniel-beck
Member

daniel-beck commented Oct 4, 2016

I've left out most LTS releases and only noted the weeklies, since new API shouldn't be particularly relevant for those (and are likely to be harmful).

@jenkinsci/code-reviewers

@oleg-nenashev

This comment has been minimized.

Show comment
Hide comment
@oleg-nenashev

oleg-nenashev Oct 4, 2016

Member

#2571 addresses Console Commands. I'd rather exclude them from this PR in order to avoid conflicts

Member

oleg-nenashev commented Oct 4, 2016

#2571 addresses Console Commands. I'd rather exclude them from this PR in order to avoid conflicts

@oleg-nenashev

This comment has been minimized.

Show comment
Hide comment
@oleg-nenashev

oleg-nenashev Oct 4, 2016

Member

But thanks for doing it in any case. Was somewhere in my TODO list, but I've never addressed it completely

Member

oleg-nenashev commented Oct 4, 2016

But thanks for doing it in any case. Was somewhere in my TODO list, but I've never addressed it completely

@oleg-nenashev

This comment has been minimized.

Show comment
Hide comment
@oleg-nenashev
Member

oleg-nenashev commented Oct 4, 2016

PWNED by #2576. @batmat

@daniel-beck

This comment has been minimized.

Show comment
Hide comment
@daniel-beck

daniel-beck Oct 4, 2016

Member

@oleg-nenashev Why would that be a close reason?

Member

daniel-beck commented Oct 4, 2016

@oleg-nenashev Why would that be a close reason?

@oleg-nenashev

This comment has been minimized.

Show comment
Hide comment
@oleg-nenashev

oleg-nenashev Oct 4, 2016

Member

@daniel-beck Sorry, just assigned wrong label

Member

oleg-nenashev commented Oct 4, 2016

@daniel-beck Sorry, just assigned wrong label

@oleg-nenashev

This comment has been minimized.

Show comment
Hide comment
@oleg-nenashev

oleg-nenashev Oct 12, 2016

Member

Still a merge conflict

Member

oleg-nenashev commented Oct 12, 2016

Still a merge conflict

@daniel-beck

This comment has been minimized.

Show comment
Hide comment
@daniel-beck

daniel-beck Oct 15, 2016

Member

Fixed the merge conflicts, one line endings file, two where #2571 got it wrong.

Member

daniel-beck commented Oct 15, 2016

Fixed the merge conflicts, one line endings file, two where #2571 got it wrong.

@oleg-nenashev

Line ending got replaced by a wrong one, but other changes LGTM

@oleg-nenashev

This comment has been minimized.

Show comment
Hide comment
@oleg-nenashev

oleg-nenashev Oct 15, 2016

Member

OK, I agree with @KostyaSha it is not that important

Member

oleg-nenashev commented Oct 15, 2016

OK, I agree with @KostyaSha it is not that important

@daniel-beck

This comment has been minimized.

Show comment
Hide comment
@daniel-beck

daniel-beck Oct 15, 2016

Member

@oleg-nenashev Fixed the missing line ending in the last line.

Fixing merge conflicts when all line endings are changed is a PITA ☹️

Member

daniel-beck commented Oct 15, 2016

@oleg-nenashev Fixed the missing line ending in the last line.

Fixing merge conflicts when all line endings are changed is a PITA ☹️

@oleg-nenashev

This comment has been minimized.

Show comment
Hide comment
@oleg-nenashev

oleg-nenashev Oct 15, 2016

Member

re-👍

On Oct 15, 2016 14:25, "Daniel Beck" notifications@github.com wrote:

@oleg-nenashev https://github.com/oleg-nenashev Fixed the missing line
ending in the last line.

Fixing merge conflicts when all line endings are changed is a PITA ☹️


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#2578 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AC3IoMGJSHBKDYEDmG78q3V1WnOKHesUks5q0UTTgaJpZM4KNckU
.

Member

oleg-nenashev commented Oct 15, 2016

re-👍

On Oct 15, 2016 14:25, "Daniel Beck" notifications@github.com wrote:

@oleg-nenashev https://github.com/oleg-nenashev Fixed the missing line
ending in the last line.

Fixing merge conflicts when all line endings are changed is a PITA ☹️


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#2578 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AC3IoMGJSHBKDYEDmG78q3V1WnOKHesUks5q0UTTgaJpZM4KNckU
.

@batmat

batmat approved these changes Oct 16, 2016

👍
Yeah, sorry, was a necessary evil. The good news is it was a one-time to now make mixing newline formats impossible.

@daniel-beck daniel-beck merged commit 2311ae8 into jenkinsci:master Oct 16, 2016

2 checks passed

Jenkins This pull request looks good
Details
continuous-integration/jenkins/pr-head This commit looks good
Details

oleg-nenashev added a commit that referenced this pull request Oct 17, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment