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

NG Pipeline #4363

Closed
wants to merge 1 commit into from
Closed

NG Pipeline #4363

wants to merge 1 commit into from

Conversation

andrewvc
Copy link
Contributor

This backports the ng_pipeline patches from master to the 2.x branch as one squashed commit.

end
end

<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

@andrewvc Merge conflicts?

@suyograo
Copy link
Contributor

Hey @andrewvc this PR has a lot of merge conflict markers... Can you make sure they are clean and resubmit PR? Does master and 2.x diverge a lot? I thought the only big difference was the agent work from @jsvd

@andrewvc
Copy link
Contributor Author

@suyograo are you sure there are merge conflicts? Github says there aren't. I rebased it against the 2.x branch when I made this.

@suyograo
Copy link
Contributor

LGTM. Detailed reviews were done in #4340

@elasticsearch-bot
Copy link

Andrew Cholakian merged this into the following branches!

Branch Commits
2.x 8de54e4

andrewvc added a commit that referenced this pull request Dec 16, 2015
@andrewvc andrewvc closed this Dec 17, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants