Skip to content

Commit

Permalink
Merge branch '6/edge' into status-reporting-shard-side
Browse files Browse the repository at this point in the history
  • Loading branch information
MiaAltieri committed Oct 27, 2023
2 parents 624afb0 + 3dcab70 commit b3b8417
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release to latest/edge
name: Release to 6/edge

on:
push:
Expand All @@ -19,7 +19,7 @@ jobs:
name: Build charm
uses: canonical/data-platform-workflows/.github/workflows/build_charm_without_cache.yaml@v5
with:
charmcraft-snap-channel: "latest/edge"
charmcraft-snap-channel: "latest/stable"

release:
name: Release charm
Expand Down
2 changes: 1 addition & 1 deletion src/charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -1404,7 +1404,7 @@ def is_relation_feasible(self, rel_interface) -> bool:

if (
not self.is_sharding_component()
and rel_interface != Config.Relations.SHARDING_RELATIONS_NAME
and rel_interface == Config.Relations.SHARDING_RELATIONS_NAME
):
self.unit.status = BlockedStatus("role replication does not support sharding")
logger.error(
Expand Down

0 comments on commit b3b8417

Please sign in to comment.