From 0cf6e741e06bc310f776858c33cb34ac2a6acc4c Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram@metalbear.co>
Date: Mon, 21 Aug 2023 11:43:51 +0300
Subject: [PATCH] 3.60.0

---
 CHANGELOG.md                       | 29 +++++++++++++++++++++++++++++
 Cargo.toml                         |  2 +-
 changelog.d/+add-comma.internal.md |  1 -
 changelog.d/+oop-operator.added.md |  1 -
 changelog.d/1560.added.md          |  1 -
 changelog.d/1815.added.md          |  1 -
 changelog.d/1818.fixed.md          |  5 -----
 7 files changed, 30 insertions(+), 10 deletions(-)
 delete mode 100644 changelog.d/+add-comma.internal.md
 delete mode 100644 changelog.d/+oop-operator.added.md
 delete mode 100644 changelog.d/1560.added.md
 delete mode 100644 changelog.d/1815.added.md
 delete mode 100644 changelog.d/1818.fixed.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 021ff756742..fdfecd6d974 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,35 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [3.60.0](https://github.com/metalbear-co/mirrord/tree/3.60.0) - 2023-08-21
+
+
+### Added
+
+- Detect and warn when cluster is openshift
+  [#1560](https://github.com/metalbear-co/mirrord/issues/1560)
+- Add missing hook for open64, fixing certificate loading on C# + Linux
+  [#1815](https://github.com/metalbear-co/mirrord/issues/1815)
+- Small changes relevant to operator for #1782.
+
+
+### Fixed
+
+- Fixed environment on ephemeral container
+  This is done by two things:
+
+  1. There was an issue where we used `self` instead of `1` to obtain env based
+  on pid.
+  2. We didn't have container runtime to use for fetching, so now we also copy
+  env from the original pod spec and set it to ours.
+  [#1818](https://github.com/metalbear-co/mirrord/issues/1818)
+
+
+### Internal
+
+- Added a missing comma in the documentation
+
+
 ## [3.59.0](https://github.com/metalbear-co/mirrord/tree/3.59.0) - 2023-08-18
 
 
diff --git a/Cargo.toml b/Cargo.toml
index 8238a7d861f..1d1189e89ef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ resolver = "2"
 
 # latest commits on rustls suppress certificate verification
 [workspace.package]
-version = "3.59.0"
+version = "3.60.0"
 edition = "2021"
 license = "MIT"
 readme = "README.md"
diff --git a/changelog.d/+add-comma.internal.md b/changelog.d/+add-comma.internal.md
deleted file mode 100644
index f227885a90f..00000000000
--- a/changelog.d/+add-comma.internal.md
+++ /dev/null
@@ -1 +0,0 @@
-Added a missing comma in the documentation
diff --git a/changelog.d/+oop-operator.added.md b/changelog.d/+oop-operator.added.md
deleted file mode 100644
index e66f515ce64..00000000000
--- a/changelog.d/+oop-operator.added.md
+++ /dev/null
@@ -1 +0,0 @@
-Small changes relevant to operator for #1782.
diff --git a/changelog.d/1560.added.md b/changelog.d/1560.added.md
deleted file mode 100644
index 999ae978e76..00000000000
--- a/changelog.d/1560.added.md
+++ /dev/null
@@ -1 +0,0 @@
-Detect and warn when cluster is openshift
diff --git a/changelog.d/1815.added.md b/changelog.d/1815.added.md
deleted file mode 100644
index 25b89e3bcd0..00000000000
--- a/changelog.d/1815.added.md
+++ /dev/null
@@ -1 +0,0 @@
-Add missing hook for open64, fixing certificate loading on C# + Linux
\ No newline at end of file
diff --git a/changelog.d/1818.fixed.md b/changelog.d/1818.fixed.md
deleted file mode 100644
index ece2e88688c..00000000000
--- a/changelog.d/1818.fixed.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Fixed environment on ephemeral container
-This is done by two things:
-
-1. There was an issue where we used `self` instead of `1` to obtain env based on pid.
-2. We didn't have container runtime to use for fetching, so now we also copy env from the original pod spec and set it to ours.
\ No newline at end of file