Skip to content

Merge master into staging#2919

Merged
catherineluse merged 6 commits intostagingfrom
master
Dec 16, 2020
Merged

Merge master into staging#2919
catherineluse merged 6 commits intostagingfrom
master

Conversation

@catherineluse
Copy link
Contributor

No description provided.

brandond and others added 6 commits December 10, 2020 15:01
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Update docs for embedded etcd ports
* Promote etcd to stable as of 1.19.5
* Update the document accordingly to call out that in 1.19.5 and newer, embedded etcd is no longer considered experimental
* Update as per review comments
* Completely remove dqlite section - it was depreciated for quite a while.
[k3s] Update system-upgrade-controller to v0.6.2
@catherineluse catherineluse merged commit 378d083 into staging Dec 16, 2020
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