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.

Sign up for GitHub

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

Jump to bottom

deprecate master nomenclature in 2.x #319

Merged
merged 32 commits into from
Oct 31, 2022
Merged

deprecate master nomenclature in 2.x #319

merged 32 commits into from
Oct 31, 2022

Conversation

kaushalmahi12
Copy link
Contributor

Is your feature request related to a problem? Please provide an existing Issue # , or describe.
Deprecate Master Nomenclature in 2.x.

Describe the solution you are proposing
A clear and concise description of what you want to happen.

Describe alternatives you've considered
A clear and concise description of any alternative solutions or features you've considered.

Additional context
Add any other context or screenshots about the feature request here.

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.

Kaushal Kumar and others added 30 commits August 24, 2022 10:13
replace the usage of master to cluster_manager
42c2740 
Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>
@sruti1312
Update version to 2.3 (opensearch-project#258)
99b219e 
Signed-off-by: Sruti Parthiban <partsrut@amazon.com>

Signed-off-by: Sruti Parthiban <partsrut@amazon.com>
@sruti1312
Bump version to 3.0 (opensearch-project#272)
30a2d87 
Signed-off-by: Sruti Parthiban <partsrut@amazon.com>

Signed-off-by: Sruti Parthiban <partsrut@amazon.com>
@kiranprakash154
update netty and gson (opensearch-project#274)
bdb4e7f 
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
@sruti1312
Update bwc tests from 2.1 (opensearch-project#275)
3b141aa 
Signed-off-by: Sruti Parthiban <partsrut@amazon.com>

Signed-off-by: Sruti Parthiban <partsrut@amazon.com>
@sruti1312
Fix bwc tests (opensearch-project#287)
02ad0e3 
Signed-off-by: Sruti Parthiban <partsrut@amazon.com>

Signed-off-by: Sruti Parthiban <partsrut@amazon.com>
@kiranprakash154
Avoid appending origin to branch name twice for checking out PA RCA (o…
f3687f4 
…pensearch-project#284)

* safeguard against appending origin twice

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
@kiranprakash154
update jackson to 2.13.4 (opensearch-project#296)
e88f26c 
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
@prudhvigodithi
add group = org.opensearch.plugin (opensearch-project#304)
e05089a 
Signed-off-by: prudhvigodithi <pgodithi@amazon.com>
@kaushalmahi12
CVE 2022 42003 (opensearch-project#313)
fa938c2 
* add changes to address protobuf-java cve

Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>

* upgrade jackson-databind

Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>

Co-authored-by: Kaushal Kumar <kshkmr@amazon.com>
@sruti1312
Update version to 2.3 (opensearch-project#258)
d0c3ad9 
Signed-off-by: Sruti Parthiban <partsrut@amazon.com>

Signed-off-by: Sruti Parthiban <partsrut@amazon.com>
@cwillum
fix#921-README-forum-link-PerfAnalyzer (opensearch-project#266)
fe0c29d 
Signed-off-by: cwillum <cwmmoore@amazon.com>

Signed-off-by: cwillum <cwmmoore@amazon.com>
@sruti1312
Bump version to 2.4 (opensearch-project#269)
d76d514 
Signed-off-by: Sruti Parthiban <partsrut@amazon.com>

Signed-off-by: Sruti Parthiban <partsrut@amazon.com>
@sruti1312
Bump version to 3.0 (opensearch-project#272)
5df9d38 
Signed-off-by: Sruti Parthiban <partsrut@amazon.com>

Signed-off-by: Sruti Parthiban <partsrut@amazon.com>
@kiranprakash154
update netty and gson (opensearch-project#274)
d5c3ad2 
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
@sruti1312
Update bwc tests from 2.1 (opensearch-project#275)
4946e58 
Signed-off-by: Sruti Parthiban <partsrut@amazon.com>

Signed-off-by: Sruti Parthiban <partsrut@amazon.com>
@sruti1312
Fix bwc tests (opensearch-project#287)
70bc937 
Signed-off-by: Sruti Parthiban <partsrut@amazon.com>

Signed-off-by: Sruti Parthiban <partsrut@amazon.com>
@kiranprakash154
Avoid appending origin to branch name twice for checking out PA RCA (o…
54eb22f 
…pensearch-project#284)

* safeguard against appending origin twice

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
@kiranprakash154
update jackson to 2.13.4 (opensearch-project#296)
72f9b41 
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
@prudhvigodithi
add group = org.opensearch.plugin (opensearch-project#304)
8809754 
Signed-off-by: prudhvigodithi <pgodithi@amazon.com>
@kaushalmahi12
CVE 2022 42003 (opensearch-project#313)
0da2995 
* add changes to address protobuf-java cve

Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>

* upgrade jackson-databind

Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>

Co-authored-by: Kaushal Kumar <kshkmr@amazon.com>
upgrade spotbugs to fix commons-text cve
46e5c90 
Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>
add license file
4792c93 
Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>
replace the usage of master to cluster_manager
e13ce23 
Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>
@sruti1312
Update version to 2.3 (opensearch-project#258)
ee10826 
Signed-off-by: Sruti Parthiban <partsrut@amazon.com>

Signed-off-by: Sruti Parthiban <partsrut@amazon.com>
@kaushalmahi12
upgrade spotbugs to fix commons-text cve (opensearch-project#316)
3e2aea3 
* upgrade spotbugs to fix commons-text cve

Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>
Co-authored-by: Kaushal Kumar <kshkmr@amazon.com>
add license files
ae1a5c2 
Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>
@kaushalmahi12
Merge branch 'main' into IDE_compliant_change
a77c597
add rca license
cae5754 
Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>
Merge branch 'IDE_compliant_change' into 2.x
8683b83 
Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>
deprecate master nomenclature
0158896 
Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>
@kaushalmahi12 kaushalmahi12 requested review from a team, dzane17 and kkhatua October 31, 2022 22:02
revert incoming 3.0 changes from IDE_compliant branch
47448b5 
Signed-off-by: Kaushal Kumar <kshkmr@amazon.com>
@codecov-commenter
Copy link

codecov-commenter commented Oct 31, 2022 •
edited
Loading

Codecov Report

Merging #319 (0158896) into 2.x (cda3760) will decrease coverage by 1.01%.
The diff coverage is 68.75%.

❗ Current head 0158896 differs from pull request most recent head 47448b5. Consider uploading reports for the commit 47448b5 to get more accurate results

@@             Coverage Diff              @@
##                2.x     #319      +/-   ##
============================================
- Coverage     71.68%   70.67%   -1.02%     
- Complexity      367      371       +4     
============================================
  Files            44       44              
  Lines          2522     2581      +59     
  Branches        171      174       +3     
============================================
+ Hits           1808     1824      +16     
- Misses          601      644      +43     
  Partials        113      113
Impacted Files Coverage Δ
...tors/ClusterManagerThrottlingMetricsCollector.java 20.00% <33.33%> (ø)
...lyzer/collectors/ClusterManagerServiceMetrics.java 60.86% <60.00%> (ø)
.../collectors/ClusterManagerServiceEventMetrics.java 72.36% <75.00%> (ø)
...manceanalyzer/collectors/NodeDetailsCollector.java 81.53% <87.50%> (+0.28%) ⬆️
...performanceanalyzer/PerformanceAnalyzerPlugin.java 76.92% <100.00%> (ø)
...org/opensearch/performanceanalyzer/util/Utils.java 92.10% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@dzane17
Copy link
Contributor

dzane17 commented Oct 31, 2022

Is there any way to fix DCO?

@kaushalmahi12
Copy link
Contributor Author

Is there any way to fix DCO?

Done

@kkhatua kkhatua mentioned this pull request Oct 31, 2022
Closed
@kaushalmahi12 kaushalmahi12 merged commit 4138436 into opensearch-project:2.x Oct 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kkhatua kkhatua kkhatua approved these changes

@dzane17 dzane17 dzane17 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@kaushalmahi12 @codecov-commenter @dzane17 @kkhatua @sruti1312 @kiranprakash154 @prudhvigodithi @cwillum