From e433fd648b5dbf357ff2db9aa04bf8d98ce862f9 Mon Sep 17 00:00:00 2001
From: David Reed <d.reed@salesforce.com>
Date: Fri, 10 Sep 2021 10:43:53 -0600
Subject: [PATCH 1/5] Add CODEOWNERS, other cleanup

---
 .github/CODEOWNERS               | 10 ++++++++++
 .github/PULL_REQUEST_TEMPLATE.md |  5 +++++
 cumulusci.yml                    |  3 +++
 3 files changed, 18 insertions(+)
 create mode 100644 .github/CODEOWNERS
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..58f86eb0
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,10 @@
+# Python
+*.py                  @SalesforceFoundation/release-engineering-reviewers
+
+# CumulusCI
+/cumulusci.yml        @SalesforceFoundation/release-engineering-reviewers
+/tasks/               @SalesforceFoundation/release-engineering-reviewers
+
+# Actions
+/.github                @SalesforceFoundation/release-engineering-reviewers
+/scripts                @SalesforceFoundation/release-engineering-reviewers
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..aa56da3a
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+# Critical Changes
+
+# Changes
+
+# Issues Closed
diff --git a/cumulusci.yml b/cumulusci.yml
index 1a418870..93d2776c 100644
--- a/cumulusci.yml
+++ b/cumulusci.yml
@@ -6,6 +6,9 @@ project:
         namespace: dlrs
         api_version: '48.0'
     git:
+        repo_url: https://github.com/SFDO-Community/declarative-lookup-rollup-summaries
+        prefix_beta: beta/
+        prefix_release: release/
     source_format: sfdx
 
 tasks:

From 4946352de03887942b90459f3e9ee5d46e5ce5d4 Mon Sep 17 00:00:00 2001
From: David Reed <d.reed@salesforce.com>
Date: Fri, 10 Sep 2021 11:07:44 -0600
Subject: [PATCH 2/5] Remove build indicator, fix CODEOWNERS

---
 .github/CODEOWNERS | 10 +++++-----
 README.markdown    |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 58f86eb0..54c05cd6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,10 +1,10 @@
 # Python
-*.py                  @SalesforceFoundation/release-engineering-reviewers
+*.py                  @SFDO-Community/sfdo-release-engineers
 
 # CumulusCI
-/cumulusci.yml        @SalesforceFoundation/release-engineering-reviewers
-/tasks/               @SalesforceFoundation/release-engineering-reviewers
+/cumulusci.yml        @SFDO-Community/sfdo-release-engineers
+/tasks/               @SFDO-Community/sfdo-release-engineers
 
 # Actions
-/.github                @SalesforceFoundation/release-engineering-reviewers
-/scripts                @SalesforceFoundation/release-engineering-reviewers
\ No newline at end of file
+/.github                @SFDO-Community/sfdo-release-engineers
+/scripts                @SFDO-Community/sfdo-release-engineers
\ No newline at end of file
diff --git a/README.markdown b/README.markdown
index 011bf723..88edda55 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,8 +1,6 @@
 Declarative Rollups for Lookup Field Relationships
 ==================================================
 
-[![Build Status](https://travis-ci.org/afawcett/declarative-lookup-rollup-summaries.svg)](https://travis-ci.org/afawcett/declarative-lookup-rollup-summaries)
-
 Features Summary
 ----------------
 

From 33988dd9734f05f9234b50cce64ee9d2eee68b29 Mon Sep 17 00:00:00 2001
From: David Reed <d.reed@salesforce.com>
Date: Mon, 13 Sep 2021 13:17:53 -0600
Subject: [PATCH 3/5] Set main branch

---
 cumulusci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cumulusci.yml b/cumulusci.yml
index 93d2776c..39f068a0 100644
--- a/cumulusci.yml
+++ b/cumulusci.yml
@@ -9,6 +9,7 @@ project:
         repo_url: https://github.com/SFDO-Community/declarative-lookup-rollup-summaries
         prefix_beta: beta/
         prefix_release: release/
+        default_branch: main
     source_format: sfdx
 
 tasks:

From f7ab0c37e5a519671f8beb18d4870dc2f028ebf7 Mon Sep 17 00:00:00 2001
From: David Reed <d.reed@salesforce.com>
Date: Mon, 13 Sep 2021 13:49:45 -0600
Subject: [PATCH 4/5] Fix beta builds

---
 cumulusci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cumulusci.yml b/cumulusci.yml
index 39f068a0..b9a9ec65 100644
--- a/cumulusci.yml
+++ b/cumulusci.yml
@@ -42,7 +42,7 @@ flows:
 
     ci_beta:
         steps:
-            3.5:
+            1.5:
                 task: deploy_test_config
 
     deploy_unmanaged:

From 6f936076c3ea5d8e19af9afa37d6de50858f603f Mon Sep 17 00:00:00 2001
From: David Reed <d.reed@salesforce.com>
Date: Mon, 13 Sep 2021 14:28:11 -0600
Subject: [PATCH 5/5] Add test retries

---
 cumulusci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cumulusci.yml b/cumulusci.yml
index b9a9ec65..2cac382c 100644
--- a/cumulusci.yml
+++ b/cumulusci.yml
@@ -33,6 +33,10 @@ tasks:
         options:
             # Preserve existing code coverage level
             required_org_code_coverage_percent: 87
+            retry_failures:
+                - "unable to obtain exclusive access to this record"
+                - "UNABLE_TO_LOCK_ROW"
+            retry_always: True
 
 flows:
     config_apextest: