Skip to content

Commit 63bfd2a

Browse files
authored
update readme for proper branching (#232)
1 parent 24bcd33 commit 63bfd2a

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

README.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@ For more information, see the [Getting Started guide](docs/prometheus-federator/
2121
### Branches and Releases
2222
This is the current branch strategy for `rancher/prometheus-federator`, it may change in the future.
2323

24-
| Branch | Tag | Rancher |
25-
|----------------|------------------|------------------------|
26-
| `main` (v3.x) | `head`, `v3.x.x` | `main` branch (`head`) |
27-
| `release/v1.x` | `v1.x.x` | `v2.10.x`, `v2.9.x` |
28-
| `release/v0.x` | `v0.x.x` | Legacy Branch |
29-
30-
> [!NOTE]
31-
> We are still adopting our new Branch strategy. Soon all Rancher Minors will have a branch targeting them.
32-
> When a Branch for v2.x is created 2.10 will be updated to use that rather than v1.x.
24+
| Branch | Tag | Rancher |
25+
|----------------|----------|------------------------|
26+
| `main` | `head` | `main` branch (`head`) |
27+
| `release/v3.x` | `v3.x.x` | `v2.11.x` |
28+
| `release/v2.x` | `v2.x.x` | `v2.10.x` |
29+
| `release/v1.x` | `v1.x.x` | `v2.9.x` |
30+
| `release/v0.x` | `v0.x.x` | Legacy Branch |
3331

3432

3533
## More Info

0 commit comments

Comments
 (0)