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

Merge main to 1.x #81

Merged
merged 11 commits into from
Nov 4, 2021
Merged

Conversation

qreshi
Copy link
Contributor

@qreshi qreshi commented Nov 3, 2021

Description

Merge branch main to 1.x since it is behind.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

ketanv3 and others added 11 commits July 1, 2021 16:06
1. Re-enabled the 'licenseHeaders' check in the build.gradle file.
2. Added an IntelliJ copyright profile to auto-generate the SPDX license header.

Signed-off-by: Ketan Verma <[email protected]>
…h-project#44)

* Bumping job-scheduler to build with OpenSearch(main) 1.1.0

Signed-off-by: Sarat Vemulapalli <[email protected]>

* Updating docs link to our documentation website.

Signed-off-by: Sarat Vemulapalli <[email protected]>
* added Getting Started section
* Adds delay parameter to job scheduler

* Adds tests for job scheduler delay parameter

* Changes test and build workflow to 1.1 and corrects links

Signed-off-by: Clay Downs <[email protected]>
* Updates job scheduler version to 1.2 and uses Maven for 1.2 dependencies

Signed-off-by: Clay Downs <[email protected]>
* Publish MD5 and SHA1 signatures.

Signed-off-by: dblock <[email protected]>

* Also publish 256 and 512 checksums.

Signed-off-by: dblock <[email protected]>
Copy link
Contributor

@downsrob downsrob left a comment

Choose a reason for hiding this comment

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

My commits should go to 1.2, and I am fairly sure that the others included in this merge should as well

@qreshi qreshi merged commit ebf2a75 into opensearch-project:1.x Nov 4, 2021
@qreshi qreshi deleted the merge-main-to-1.x branch November 4, 2021 00:11
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.

9 participants