From 560bac74545c2029146543fde7b863afc3c9403f Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Wed, 12 Jun 2024 14:42:21 +0200 Subject: [PATCH] Update stackable-operator to version 0.69.3 --- Cargo.lock | 6 +++--- Cargo.nix | 14 +++++++------- Cargo.toml | 6 +++--- crate-hashes.json | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cf87daa8..b69570af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2073,8 +2073,8 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stackable-operator" -version = "0.69.0" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/vector-log-processing#fa45a676e185c3668063ee0d2528fd400d586138" +version = "0.69.3" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.69.3#cb5943f03587eb8c90048b67a810c396de42a579" dependencies = [ "chrono", "clap", @@ -2110,7 +2110,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.0" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/vector-log-processing#fa45a676e185c3668063ee0d2528fd400d586138" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.69.3#cb5943f03587eb8c90048b67a810c396de42a579" dependencies = [ "darling", "proc-macro2", diff --git a/Cargo.nix b/Cargo.nix index 6e1a399e..6d68ff56 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6272,13 +6272,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.69.0"; + version = "0.69.3"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech//operator-rs.git"; - rev = "fa45a676e185c3668063ee0d2528fd400d586138"; - sha256 = "1z34scmf9vid1lsbkdrywzqkyizfxj5slll4wl5gf43w2yya5kqv"; + url = "https://github.com/stackabletech/operator-rs.git"; + rev = "cb5943f03587eb8c90048b67a810c396de42a579"; + sha256 = "192bwr3ll1hwsvq9qrk3rsmax8m3zpn55cb44c9r201krmgn51gz"; }; authors = [ "Stackable GmbH " @@ -6425,9 +6425,9 @@ rec { edition = "2021"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech//operator-rs.git"; - rev = "fa45a676e185c3668063ee0d2528fd400d586138"; - sha256 = "1z34scmf9vid1lsbkdrywzqkyizfxj5slll4wl5gf43w2yya5kqv"; + url = "https://github.com/stackabletech/operator-rs.git"; + rev = "cb5943f03587eb8c90048b67a810c396de42a579"; + sha256 = "192bwr3ll1hwsvq9qrk3rsmax8m3zpn55cb44c9r201krmgn51gz"; }; procMacro = true; authors = [ diff --git a/Cargo.toml b/Cargo.toml index 1ab9e26a..9d8270cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,11 +24,11 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_yaml = "0.9" snafu = "0.8" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.69.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.69.3" } product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.6.0" } strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.37", features = ["full"] } tracing = "0.1" -[patch."https://github.com/stackabletech/operator-rs.git"] -stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "fix/vector-log-processing" } +# [patch."https://github.com/stackabletech/operator-rs.git"] +# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" } diff --git a/crate-hashes.json b/crate-hashes.json index 49f84062..f28dcafb 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,5 +1,5 @@ { - "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2Fvector-log-processing#stackable-operator-derive@0.3.0": "1z34scmf9vid1lsbkdrywzqkyizfxj5slll4wl5gf43w2yya5kqv", - "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2Fvector-log-processing#stackable-operator@0.69.0": "1z34scmf9vid1lsbkdrywzqkyizfxj5slll4wl5gf43w2yya5kqv", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.69.3#stackable-operator-derive@0.3.0": "192bwr3ll1hwsvq9qrk3rsmax8m3zpn55cb44c9r201krmgn51gz", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.69.3#stackable-operator@0.69.3": "192bwr3ll1hwsvq9qrk3rsmax8m3zpn55cb44c9r201krmgn51gz", "git+https://github.com/stackabletech/product-config.git?tag=0.6.0#product-config@0.6.0": "1ixc2x7540sxdmc92hqdcwm24rj8i1ivjsvwk2d57pdsq03j2x41" } \ No newline at end of file