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

Update protected-branches to include branch_9_5 #2211

Merged
merged 1 commit into from
Jan 25, 2024
Merged

Update protected-branches to include branch_9_5 #2211

merged 1 commit into from
Jan 25, 2024

Conversation

gerlowskija
Copy link
Contributor

Description

branch_9_5 has recently been created and should be treated as 'protected'.

Solution

Branch protection is governed by .asf.yaml on main, so this PR makes the required change there.

Tests

None 😦

Checklist

Please review the following and check all that apply:

  • I have reviewed the guidelines for How to Contribute and my code conforms to the standards described there to the best of my ability.
  • I have created a Jira issue and added the issue ID to my pull request title.
  • I have given Solr maintainers access to contribute to my PR branch. (optional but recommended)
  • I have developed this patch against the main branch.
  • I have run ./gradlew check.

@gerlowskija
Update protected-branches to include branch_9_5
a9b951e 
Also fixes a broken comment-link to the ASF's docs on .asf.yaml syntax.
janhoy
janhoy approved these changes Jan 23, 2024
View reviewed changes
Copy link
Contributor

@janhoy janhoy left a comment

Choose a reason for hiding this comment

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

You are correct, those sections of the .asf.yaml file is only ever read from main branch, so the wizard should have switched branches. If you care to update it, that would be zuper

@gerlowskija gerlowskija merged commit 3cc92cf into apache:main Jan 25, 2024
3 checks passed
@gerlowskija gerlowskija deleted the update-branch-protection-for-950 branch January 25, 2024 21:42
freedev added a commit to freedev/solr that referenced this pull request Jan 26, 2024
@freedev
Merge branch 'main' into jira/solr-17112
fa9bfc7 
* main: (27 commits)
  Update protected-branches to include branch_9_5 (apache#2211)
  SOLR-16397: Tweak v2 'REQUESTSTATUS' API to be more REST-ful  (apache#2144)
  SOLR-17120: handle null value when merging partials (apache#2214)
  SOLR-17119: Fix exception swallowing in /cluster/plugins (apache#2202)
  SOLR-15960 Cut over System.getProperty() to EnvUtils for modules (apache#2193)
  Final fix for node problems (apache#2208)
  SOLR-16397: Fix warning in merge-indices docs
  Fix nodeSetup, use node distBaseUrl instead of registry (apache#2208)
  Add next minor version 9.6.0
  SOLR-17089: Upgrade Jersey to 3.1.5 (apache#2178)
  solr-ref-guide: fix typo in result-clustering.adoc (apache#2210)
  SOLR-17074: Fixed not correctly escaped quote in bin/solr script (apache#2200)
  SOLR-15960: Rename getProp as getProperty (apache#2194)
  Add npmRegistry for nodeSetup as well (apache#2208)
  Give NPM registry option for downloading node tools (apache#2208)
  SOLR-17116: Fix INSTALLSHARDDATA async reporting (apache#2188)
  SOLR-17066: Replace 'data store' term in code and docs (apache#2201)
  SOLR-17121: Fix SchemaCodecFactory to get PostingsFormat and DocValues from field. (apache#2206)
  Sync CHANGES for 9.4.1
  Add bugfix version 9.4.1
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpoerschke cpoerschke cpoerschke approved these changes

@janhoy janhoy janhoy 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.
3 participants
@gerlowskija @janhoy @cpoerschke