From 5cc221659146d8da355218a3f3992e7941014f91 Mon Sep 17 00:00:00 2001
From: Tony Meyer <tony.meyer@canonical.com>
Date: Thu, 27 Jun 2024 15:39:11 +1200
Subject: [PATCH] chore: add changelog entries and bump version for 2.14.1
 (#1276)

The usual version bump and changelog entries.

This is for 2.14.1 rather than 2.15 since we've got a bunch of bug fixes
and doc improvements and CI enhancements, but not new features.
---
 CHANGES.md     | 27 +++++++++++++++++++++++++++
 ops/version.py |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9bddcfcf5..21664d6ec 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,30 @@
+# 2.14.1 - 27 Jun 2024
+
+## Fixes
+
+* Add connect timeout for exec websockets to avoid hanging (#1247)
+* Adjust Harness secret behaviour to align with Juju (#1248)
+
+## Tests
+
+* Fix TypeError when running test.pebble_cli (#1245)
+* Properly clean up after running setup_root_logging in test_log (#1259)
+* Verify that defer() is not usable on stop,remove,secret-expired,secret-rotate (#1233)
+
+## Documentation
+
+* Fix HACKING.md link on PyPI, and internal links (#1261, #1236)
+* Add a section to HACKING.md on PR titles (commit messages to main) (#1252)
+* Add release step to update pinned charm tests (#1213)
+* Add a security policy (#1266)
+
+## CI
+
+* Only run tests once on push to PR (#1242)
+* Validate PR title against conventional commit rules in (#1262)
+* Only update ops, not all dependencies, in charm tests in (#1275)
+* Add artefact attestation (#1267)
+
 # 2.14.0 - 29 May 2024
 
 ## Features
diff --git a/ops/version.py b/ops/version.py
index 28f7a2cf4..8ae918bac 100644
--- a/ops/version.py
+++ b/ops/version.py
@@ -17,4 +17,4 @@
 This module is NOT to be used when developing charms using ops.
 """
 
-version: str = '2.15.0.dev0'
+version: str = '2.14.1'