Fix merge mistakes when merging release/v2.26 into release/v2

thallgren · thallgren · commit 350b9798ef5d · 2026-02-14T16:34:28.000+01:00
Signed-off-by: Thomas Hallgren &lt;thomas@tada.se&gt;
diff --git a/CHANGELOG.yml b/CHANGELOG.yml
@@ -25,7 +25,7 @@
 # For older changes, see CHANGELOG.OLD.md
 items:
   - version: 2.27.0
-    date: 2026-02-14
+    date: (TBD)
     notes:
       - type: feature
         title: Add macOS package installer with root daemon as a system service
diff --git a/docs/reference/cli/telepresence_genyaml_config.md b/docs/reference/cli/telepresence_genyaml_config.md
@@ -17,7 +17,7 @@ Generate YAML for the agent's entry in the telepresence-agents configmap. See ge
 
 ### Flags:
 ```
-      --agent-image string         The qualified name of the agent image (default &quot;ghcr.io/telepresenceio/tel2:2.26.2&quot;)
+      --agent-image string         The qualified name of the agent image (default &quot;ghcr.io/telepresenceio/tel2:2.27.0&quot;)
       --agent-port uint16          The port number you wish the agent to listen on. (default 9900)
   -h, --help                       help for config
   -i, --input string               Path to the yaml containing the workload definition (i.e. Deployment, StatefulSet, etc). Pass '-' for stdin.. Mutually exclusive to --workload
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,7 +1,7 @@
 
 [comment]: # (Code generated by relnotesgen. DO NOT EDIT.)
 # <img src="images/logo.png" height="64px"/> Telepresence Release Notes
-## Version 2.27.0 <span style="font-size: 16px;">(February 14)</span>
+## Version 2.27.0
 ## <div style="display:flex;"><img src="images/feature.png" alt="feature" style="width:30px;height:fit-content;"/><div style="display:flex;margin-left:7px;">[Add macOS package installer with root daemon as a system service](install/client)</div></div>
 <div style="margin-left: 15px">
 
diff --git a/docs/release-notes.mdx b/docs/release-notes.mdx
@@ -7,7 +7,7 @@ import { Note, Title, Body } from '@site/src/components/ReleaseNotes'
 [comment]: # (Code generated by relnotesgen. DO NOT EDIT.)
 
 # Telepresence Release Notes
-## Version 2.27.0 <span style={{fontSize:'16px'}}>(February 14)</span>
+## Version 2.27.0
 <Note>
 	<Title type="feature" docs="install/client">Add macOS package installer with root daemon as a system service</Title>
 	<Body>
