Merge pull request #833 from opencadc/release-please--branches--main-…

…-components--skaha chore(main): release 0.27.6
opencadc · Mar 11, 2025 · 0dee6bd · 0dee6bd
2 parents 5067481 + 152e3ca
commit 0dee6bd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "0.27.5"
+  ".": "0.27.6"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.27.6](https://github.com/opencadc/science-platform/compare/0.27.5...0.27.6) (2025-03-11)
+
+
+### Bug Fixes
+
+* merge main and resolve conflicts ([93e0551](https://github.com/opencadc/science-platform/commit/93e0551c70421d6968cc614f0ec227555428df9d))
+* merge main with conflicts ([31375e0](https://github.com/opencadc/science-platform/commit/31375e010662688c671b4afce597bfa1892cfaa7))
+* new kubernetes client version in dockerfile ([bda6626](https://github.com/opencadc/science-platform/commit/bda6626c7809f77a8d047ab2f8c55046c4f5c06c))
+* remove old switch that causes warning or error in logs ([be90450](https://github.com/opencadc/science-platform/commit/be904505bf28fb641da39c32c113255ecbd84718))
+
 ## [0.27.5](https://github.com/opencadc/science-platform/compare/0.27.4...0.27.5) (2025-02-13)
 
 

diff --git a/skaha/gradle.properties b/skaha/gradle.properties
@@ -13,5 +13,5 @@ majorVersion = 0
 minorVersion = 27
 # x-release-please-end
 # x-release-please-start-patch
-patchVersion = 5
+patchVersion = 6
 # x-release-please-end