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 7.13.2 (unreleased) #3

Merged
merged 484 commits into from
Feb 15, 2023
Merged

Merge 7.13.2 (unreleased) #3

merged 484 commits into from
Feb 15, 2023

Conversation

elv-gilles
Copy link
Collaborator

@elv-gilles elv-gilles commented Feb 14, 2023

Patch to update develop to 05d782b of upstream master.

noticeable:

  • changes in embedded/config for WriteQueueCap and WriteQueueBatchSz. Default values taken from rqlite.
  • shutdown sequence in Embedded.Shutdown

otoolep and others added 30 commits October 26, 2022 12:50
test: use `T.TempDir` to create temporary test directory
Log, and add to version output, SQLite release
Also upgrade other dependencies.
It's the Store object that needs it.
otoolep and others added 25 commits January 7, 2023 16:33
This reverts commit 7e3437f.
This reverts commit 5328212.
This reverts commit f9d1fb7.
This reverts commit d5896aa.
This reverts commit 92a89f0.
This reverts commit 2681a77.
This reverts commit 2652f29, reversing
changes made to 5af24e3.
Better error message for "connection refused" case
# Conflicts:
#	cluster/bootstrap.go
#	cluster/join.go
#	cluster/service.go
#	cmd/rqlite/main.go
#	cmd/rqlited/main.go
#	go.mod
#	http/service.go
#	http/service_test.go
#	system_test/cluster_test.go
Copy link
Collaborator

@lukseven lukseven left a comment

Choose a reason for hiding this comment

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

Looks good.

embedded/config.go Show resolved Hide resolved
@elv-gilles elv-gilles merged commit ba25175 into develop Feb 15, 2023
@elv-gilles elv-gilles deleted the merge-7_13_2 branch February 15, 2023 10:54
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.

4 participants