release: v1.1.0-rc.1

sozu-proxy · Jul 25, 2024 · 6507da3 · 6507da3
1 parent 8a2a712
commit 6507da3
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/Cargo.toml b/bin/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/sozu-proxy/sozu"
 readme = "README.md"
 documentation = "https://docs.rs/sozu"
 homepage = "https://sozu.io"
-version = "1.1.0-rc.0"
+version = "1.1.0-rc.1"
 license = "AGPL-3.0"
 authors = [
   "Geoffroy Couprie <[email protected]>",
@@ -34,8 +34,8 @@ tempfile = "^3.10.1"
 termion = "^4.0.0"
 thiserror = "^1.0.61"
 
-sozu-command-lib = { path = "../command", version = "^1.1.0-rc.0" }
-sozu-lib = { path = "../lib", version = "1.1.0-rc.0" }
+sozu-command-lib = { path = "../command", version = "^1.1.0-rc.1" }
+sozu-lib = { path = "../lib", version = "1.1.0-rc.1" }
 
 [target.'cfg(target_os="linux")'.dependencies]
 num_cpus = "^1.16.0"

diff --git a/command/Cargo.toml b/command/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/sozu-proxy/sozu"
 readme = "README.md"
 documentation = "https://docs.rs/sozu-command-lib"
 homepage = "https://sozu.io"
-version = "1.1.0-rc.0"
+version = "1.1.0-rc.1"
 license = "LGPL-3.0"
 authors = [
   "Geoffroy Couprie <[email protected]>",

diff --git a/e2e/Cargo.toml b/e2e/Cargo.toml
@@ -14,5 +14,5 @@ rustls = { version = "^0.21.10", features = ["dangerous_configuration"] }
 time = "^0.3.36"
 tokio = { version = "1.37.0", features = ["net", "rt-multi-thread"] }
 
-sozu-command-lib = { path = "../command", version = "^1.1.0-rc.0" }
-sozu-lib = { path = "../lib", version = "^1.1.0-rc.0" }
+sozu-command-lib = { path = "../command", version = "^1.1.0-rc.1" }
+sozu-lib = { path = "../lib", version = "^1.1.0-rc.1" }
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/sozu-proxy/sozu"
 readme = "README.md"
 documentation = "https://docs.rs/sozu-lib"
 homepage = "https://sozu.io"
-version = "1.1.0-rc.0"
+version = "1.1.0-rc.1"
 license = "AGPL-3.0"
 authors = [
   "Clément Delafargue <[email protected]>",
@@ -52,7 +52,7 @@ thiserror = "^1.0.61"
 time = "^0.3.36"
 once_cell = "1.19.0"
 
-sozu-command-lib = { path = "../command", version = "1.1.0-rc.0" }
+sozu-command-lib = { path = "../command", version = "1.1.0-rc.1" }
 
 [dev-dependencies]
 quickcheck = "^1.0.3"

diff --git a/os-build/archlinux/PKGBUILD b/os-build/archlinux/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 
 pkgname=sozu-git
-pkgver=1.1.0-rc.0
+pkgver=1.1.0-rc.1
 pkgrel=1
 pkgdesc="HTTP reverse proxy, configurable at runtime, fast and safe, built in Rust"
 arch=('i686' 'x86_64')

diff --git a/os-build/linux-rpm/sozu.spec b/os-build/linux-rpm/sozu.spec
@@ -6,11 +6,7 @@
 
 Summary:	A lightweight, fast, always-up reverse proxy server.
 Name:		sozu
-<<<<<<< HEAD
-Version:	1.0.4
-=======
-Version:	1.1.0-rc.0
->>>>>>> a85689c1 (release: v1.1.0-rc.0)
+Version:	1.1.0-rc.1
 Release:	1%{?dist}
 Epoch:		1
 License:	AGPL-3.0