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

prepare for v1.4.19 release #263

Merged
merged 4 commits into from
Dec 4, 2018

Conversation

phreaker0
Copy link
Collaborator

As requested in #254

@phreaker0
Copy link
Collaborator Author

@jimsalterjrs ping :-)

@jimsalterjrs
Copy link
Owner

@phreaker0 I'm sorry, I'm probably making your life harder approving things out-of-order. If we need what's in here, it'll need to get re-based... but you may want to hang on doing it until I work my way through the rest of the PRs that merge cleanly. I'll ping you again in a bit.

@phreaker0
Copy link
Collaborator Author

will do! No problem, I'm excited that this moves forward!

@jimsalterjrs
Copy link
Owner

@phreaker0 I've merged everything that I could merge without rebasing, now would be a good time to rebase the PRs we want to accept. Can you work on that? I want to get the PR list cleaned up this afternoon, then do some testing so we can push out a whopper of a release with all this great work I know you and a few other folks have been using out-of-tree for a while now.

@phreaker0
Copy link
Collaborator Author

@jimsalterjrs I just added all the changes from the recent merges, i didn't notice that you already added the recent onse to the generic changelist. Should I use your descriptions for the recent changes to resolve the conflict?

@jimsalterjrs
Copy link
Owner

I like your more detailed stuff honestly. Biggest problem is the version number though; there's a reason I hadn't assigned one yet.

This version can't be 1.4.19; by semantic versioning we need a 2.0.0 due to the backwards-incompatible required update on sanoid.defaults.conf IMO. Thoughts? I might be overthinking that and a 1.5.0 is sufficient, but I know this definitely amounts to much more than "patches". =)

https://semver.org/

@phreaker0
Copy link
Collaborator Author

I wouldn't consider the changes to the defaults file as backwards incompatible as it's part of the software and needs to be updated as well, so 1.5.0 would work as the user managed sanoid.conf configuration should all work. But the weekly interval PR also adapted/fixed the warning periods which probably affect existing configurations in rare cases, so because of this I would go with 2.0.0 to be in line with semver.

@jimsalterjrs
Copy link
Owner

Fair. Let's plan on 2.0.0 then, and unless I'm missing something, you covered everything in your proposed CHANGELIST that I did, but in more detail giving credit to authors, so let's go with your version (but with the updated version number).

We'll need to fix the version number in sanoid and syncoid themselves to match, of course.

Are you ready to feature-freeze for this version number?

@phreaker0
Copy link
Collaborator Author

@jimsalterjrs yeah, feature freeze sounds good. #300 should be merged to prevent the introduced warnings. I will update this PR.

@jimsalterjrs jimsalterjrs merged commit e186f3c into jimsalterjrs:master Dec 4, 2018
@phreaker0 phreaker0 deleted the prepare-release branch March 24, 2023 08: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.

2 participants