Merge pull request #263 from retis-org/at/release-1.2

Release 1.2
retis-org · Sep 28, 2023 · 9853e27 · 9853e27
2 parents ce7e6b3 + cd3f8e9
commit 9853e27
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "retis"
-version = "1.1.0"
+version = "1.2.0"
 license = "GPL-2.0-only"
 description = "Tracing packets in the Linux networking stack, using eBPF and interfacing with control and data paths such as OvS or Netfilter"
 repository = "https://github.com/retis-org/retis"
@@ -42,7 +42,7 @@ pcap = "1.0"
 plain = "0.2"
 rbpf = {version = "0.2", optional = true}
 regex = "1.7"
-retis-derive = {version = "1.1", path = "./retis-derive"}
+retis-derive = {version = "1.2", path = "./retis-derive"}
 serde = {version = "1.0", features = ["derive"]}
 serde_json = "1.0"
 serde_with = "3.0"

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ $ retis <command> --help
 ## Examples
 
 ### Drop monitoring
-Listing packets being dropped by the kerenel with an associated stack trace and drop reason
+Listing packets being dropped by the kernel with an associated stack trace and drop reason
 ```
 $ retis -p dropmon collect
 00:42:00 [INFO] 4 probe(s) loaded

diff --git a/RELEASE.md b/RELEASE.md
@@ -8,7 +8,6 @@
    1. Run `cargo publish --dry-run` to check for any issue.
    1. Open a PR and get it merged. This must have runtime tests enabled!
    1. Tag the right commit in the `vx.y.z` form and push it.
-1. Release on [crates.io](https://crates.io): `cargo publish`.
 1. Release binaries.
    1. Build a new set of packages on [copr](https://copr.fedorainfracloud.org/coprs/g/retis/retis/).
       1. Update the spec file in our [copr](https://github.com/retis-org/copr)
@@ -21,6 +20,7 @@
       1. `$ buildah push quay.io/retis/retis:x.y.z`
       1. Manually tag on the web UI the image pushed with `latest`, if
          applicable.
+1. Release on [crates.io](https://crates.io): `cargo publish`.
 1. Write and publish a release notes in the GitHub interface. This must be done
    once the rpm and the image successfully built to allow pushing last minute
    build fixes.
diff --git a/docs/README.md b/docs/README.md
@@ -23,7 +23,7 @@ output the events to the console.
 
 ```
 $ retis collect
-00:42:00 [INFO] Collector(s) started: skb-tracking, skb, skb-drop, ovs
+00:42:00 [INFO] Collector(s) started: skb-tracking, skb, skb-drop, ovs, nft, ct
 00:42:01 [INFO] 5 probe(s) loaded
 ...
 $ retis collect -c skb,skb-drop
@@ -57,6 +57,7 @@ Currently supported collectors are:
 | skb-tracking | Packet tracking id  | No[^1]          |
 | ovs          | OpenVSwitch data    | Yes (many)      |
 | nft          | Nftables context    | Yes (1)         |
+| ct           | Conntrack info      | No              |
 
 See `retis collect --help` for a description of each collector and its command
 line arguments.

diff --git a/retis-derive/Cargo.toml b/retis-derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "retis-derive"
-version = "1.1.0"
+version = "1.2.0"
 edition = "2021"
 
 [lib]

diff --git a/src/main.rs b/src/main.rs
@@ -17,7 +17,7 @@ use crate::{cli::get_cli, core::inspect::init_inspector, module::get_modules};
 // Re-export derive macros.
 use retis_derive::*;
 
-const VERSION_NAME: &str = "pizza margherita";
+const VERSION_NAME: &str = "pizza marinara";
 
 fn main() -> Result<()> {
     let mut cli = get_cli()?.build();