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

backport 936faba6c43 to 6.x #35045

Merged
merged 2 commits into from
Oct 31, 2018
Merged

backport 936faba6c43 to 6.x #35045

merged 2 commits into from
Oct 31, 2018

Conversation

pcsanwald
Copy link
Contributor

This PR backports delete job from master to 6.x branch.

@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

Copy link
Member

@cbuescher cbuescher left a comment

Choose a reason for hiding this comment

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

I left a few minor comments, looks good otherwise.

= new ConstructingObjectParser<>("delete_rollup_job_response", true,
args -> new DeleteRollupJobResponse((boolean) args[0]));
static {
PARSER.declareBoolean(constructorArg(), new ParseField("acknowledged"));
Copy link
Member

Choose a reason for hiding this comment

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

nit: I changed this on master to get the parser from AcknowledgedResponse using a new generateParser method that I introduced there on request of Baz. Maybe we could use the same here in the backport to make it match the version on master.

= new ConstructingObjectParser<>("put_rollup_job_response", true, args -> new PutRollupJobResponse((boolean) args[0]));
static {
PARSER.declareBoolean(constructorArg(), new ParseField("acknowledged"));
}
Copy link
Member

Choose a reason for hiding this comment

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

same here: I'd like to keep the version using generateParser since its the same as in master.

@@ -300,14 +300,19 @@ include::migration/get-assistance.asciidoc[]
:doc-tests-file: {doc-tests}/RollupDocumentationIT.java


:upid: {mainid}-rollup
:doc-tests-file: {doc-tests}/RollupDocumentationIT.java
Copy link
Member

Choose a reason for hiding this comment

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

duplication from line 299/300

@pcsanwald
Copy link
Contributor Author

@cbuescher no rush, but I believe I have addressed your comments and this is ready for re-review. thank you!

Copy link
Member

@cbuescher cbuescher left a comment

Choose a reason for hiding this comment

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

Many thanks, LGTM.

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