Merge branch '3.6' into 3.6-into-main

manadart · Jul 8, 2024 · 38834a8 · 38834a8
2 parents 4a7be52 + 8cefca2
commit 38834a8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -56,7 +56,7 @@ For example, the following indicates that Go 1.22 is targeted:
 ```
 module github.com/juju/juju
 
-go 1.22.2
+go 1.22
 ```
 
 ### Official distribution

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/juju/juju
 
-go 1.22.4
+go 1.22
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0

diff --git a/scripts/juju-mongotop/go.mod b/scripts/juju-mongotop/go.mod
@@ -1,6 +1,6 @@
 module github.com/juju/juju/scripts/juju-mongotop
 
-go 1.21
+go 1.22
 
 require github.com/olekukonko/tablewriter v0.0.5
-Original file line number
+Diff line change
@@ Expand Up @@
     ```
     module github.com/juju/juju
-    go 1.22.2
+    go 1.22
     ```
     ### Official distribution
@@ Expand Down @@