Skip to content

Commit

Permalink
Merge branch 'master' into fix-replica-node
Browse files Browse the repository at this point in the history
  • Loading branch information
khushboo-rancher authored May 1, 2024
2 parents 044ab77 + da29ef3 commit 15bc83c
Show file tree
Hide file tree
Showing 31 changed files with 510 additions and 472 deletions.
341 changes: 0 additions & 341 deletions .drone.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pull_request_rules:
- name: Automatically merge PRs
conditions:
- check-success=continuous-integration/drone/pr
- check-success="Build images"
- "#approved-reviews-by>=2"
- approved-reviews-by=@longhorn/maintainer
- approved-reviews-by=@longhorn/qa
Expand All @@ -11,15 +11,15 @@ pull_request_rules:

- name: Automatically merge Renovate PRs
conditions:
- check-success=continuous-integration/drone/pr
- check-success="Build images"
- author = renovate[bot]
actions:
merge:
method: rebase

- name: Automatically approve Renovate PRs
conditions:
- check-success=continuous-integration/drone/pr
- check-success="Build images"
- author = renovate[bot]
actions:
review:
Expand Down
Loading

0 comments on commit 15bc83c

Please sign in to comment.