chore: sync main into develop (resolve conflicts)#455
Merged
wtobis-splunk merged 3 commits intodevelopfrom Apr 3, 2026
Merged
Conversation
# [7.0.0](v6.3.0...v7.0.0) (2025-06-19) ### Features * **code:** replace btool with splunk.rest ([d7fce46](d7fce46)) * init commit, new function to retrieve stanzas based on rest ([ae2b3ab](ae2b3ab)) * init commit, new function to retrieve stanzas based on rest ([619a53e](619a53e)) ### BREAKING CHANGES * **code:** Replacing the usage of btool with splunk.rest
Keep develop version (7.0.0-beta.4) when merging main's 7.0.0 release commit. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
wtobis-splunk
approved these changes
Apr 3, 2026
Contributor
|
🎉 This PR is included in version 8.0.0-beta.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
mainintodevelopto resolve version conflicts blocking PR chore: merge develop into main #453pyproject.tomlandsolnlib/__init__.py(version strings:7.0.0on main vs7.0.0-beta.4on develop)7.0.0-beta.4)Context
PR #453 (develop → main) is blocked with
CONFLICTINGmerge state becausemainhas thechore(release): 7.0.0commit that isn't indevelop. Once this PR merges, PR #453 will be conflict-free.🤖 Generated with Claude Code