Skip to content

Conversation

@Mpdreamz
Copy link
Member

Update the 7.x branch to latest greatest from 7.x

@russcam
Copy link
Contributor

russcam commented Feb 11, 2020

Is this generated from 7.x or 7.6? Should it be generated from 7.6, if it's not?

@Mpdreamz
Copy link
Member Author

Should be 7.x. We should discuss branching our next minor immediately after releasing our current minor.

@russcam
Copy link
Contributor

russcam commented Feb 11, 2020

Is this generated from 7.x or 7.6? Should it be generated from 7.6, if it's not?

Should have clarified in case it was ambiguous, Elasticsearch branch from which the REST specs are pulled, into the client 7.x branch.

Should be 7.x. We should discuss branching our next minor immediately after releasing our current minor.

Might Elasticsearch 7.x contain changes in it though that are not for the 7.6.0 client release e.g. APIs that are scheduled for Elasticsearch 7.7.0. Since Elasticsearch repository has cut a 7.6 branch, I think we should be pulling this into the client 7.x branch?

@codebrain
Copy link
Contributor

My understanding is that we pull from elastic/elasticsearch 7.6 branch into our elastic/elasticsearch-net 7.x branch.

That way we avoid picking up anything in the elastic/elasticsearch 7.x branch that might be unfinished/in progress/destined for a later minor version.

@Mpdreamz
Copy link
Member Author

Discussed offline 7.x will track 7.x from elastic/elasticsearch

@Mpdreamz Mpdreamz merged commit 060e13b into 7.x Feb 12, 2020
@Mpdreamz Mpdreamz deleted the feature/7.x/update-ll-client branch February 12, 2020 07:59
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.

4 participants