Merge branch 'master' into hmusum/change-owner

client/go/internal/cli/cmd/login.go

@@ -72,11 +72,16 @@ This command runs a browser-based authentication flow for the Vespa Cloud contro
 			})
 
 			if err != nil {
-				return fmt.Errorf("login error: %w", err)
+				switch err.Error() {
+				case "600":
+					return errHint(fmt.Errorf("Unable to login through social channels"),
+						"Your organization does not allow logging in through our social channels",
+						"Please login by entering your address into the email field")
+				default:
+					return fmt.Errorf("login error: %w", err)
+				}
 			}
 
-			cli.printSuccess("Logged in")
-
 			// store the refresh token
 			secretsStore := &auth.Keyring{}
 			err = secretsStore.Set(auth.SecretsNamespace, system.Name, res.RefreshToken)
@@ -93,7 +98,9 @@ This command runs a browser-based authentication flow for the Vespa Cloud contro
 			if err := a.WriteCredentials(creds); err != nil {
 				return fmt.Errorf("failed to write credentials: %w", err)
 			}
-			return err
+
+			cli.printSuccess("Logged in")
+			return nil
 		},
 	}
 }

flags/src/main/java/com/yahoo/vespa/flags/Flags.java

@@ -48,14 +48,6 @@ public class Flags {
 
     private static volatile TreeMap<FlagId, FlagDefinition> flags = new TreeMap<>();
 
-    public static final UnboundIntFlag CLEAR_CONNTRACK = defineIntFlag(
-            "clear-conntrack", 3,
-            List.of("hakonhall"), "2024-10-28", "2024-11-28",
-            "Clear the conntrack table:" +
-            " bit 0: after NAT/NPT rules changes." +
-            " bit 1: after WireGuard changes.",
-            "See description");
-
     public static final UnboundDoubleFlag DEFAULT_TERM_WISE_LIMIT = defineDoubleFlag(
             "default-term-wise-limit", 1.0,
             List.of("baldersheim"), "2020-12-02", "2024-12-31",