Merge upstream changes (gocql v1.7.0) #388
Open
Conversation
This file contains 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
Reassignment of copyright, where approved, and relicensing. Change phrases of "gocql team" to "the Cassandra project". New repository will be github.com/apache/cassandra-gocql-driver
patch by Mick Semb Wever; reviewed by Martin Sucha for CASSANDRA-19723
… Das patch by Mick Semb Wever; reviewed by Martin Sucha for CASSANDRA-19723
follows same settings as cassandra-java-driver, with the exception that GH issues are still enabled. patch by Mick Semb Wever; reviewed by Martin Sucha for CASSANDRA-19799
patch by Stefan Miklosovic; reviewed by Michael Semb Wever for CASSANDRA-19854
…o donate contributions to ASF ref: apache#1751 patch by Mick Semb Wever; reviewed by Martin Sucha for CASSANDRA-19723
…ributions to ASF ref: apache#1751 patch by Mick Semb Wever; reviewed by Martin Sucha for CASSANDRA-19723
ref: apache#1751 patch by Mick Semb Wever; reviewed by James Hartig for CASSANDRA-19723
The existing certificates in testdata/pki expire on September 16 2024. This commit includes a 'generate_certs.sh' script for regenerating private keys and certificates as needed. As I couldn't find the original steps used to generate these, it's possible these certificates are generated differently, but they are done in a nominal way. One slight derivation with the original certificates is that I have opted to use PKCS12 format instead of the propertiary java JKS format for the .truststore and .keystore file. The cassandra and gocql certificates also embed a spiffe in the SAN so they can eventually be used for mTLS authentication testing. patch by Andy Tolbert; reviewed by Bret McGuire for CASSANDRA-19862
patch by Bret McGuire; reviewed by Joao Reis, Martin Sucha, Andy Tolbert and James Hartig reference: apache#1817
…ious Go versions for a given release; we're continuing this practice for the 1.7.0 release. patch by Bret McGuire; reviewed by Joao Reis, Martin Sucha reference: apache#1825
patch by Bret McGuire; reviewed by Martin Sucha reference: apache#1826
|
@roydahan @dkropachev @Lorak-mmk I don't know, why but after several tries I was finally able to merge and not lose all of the commits, I merge tag v1.7.0 instead of the upstream trunk branch, I am not sure why it behaves differently, but I guess we can split merging upstream into two parts, first v1.7.0 and then the next ten commits or so |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge upstream changes as of gocql v1.7.0.