From fbfc9f8c22877dd16a3d93b82a11675f99ba7a53 Mon Sep 17 00:00:00 2001 From: Sarah LeNguyen <86625005+slenguyen@users.noreply.github.com> Date: Mon, 3 Oct 2022 08:56:45 -0400 Subject: [PATCH 1/2] Adds additional IP ranges to whitelist for running GEI with IP Allow (#31238) Co-authored-by: Steve Guntrip From 07ea7fb006fe96b044bf23c6dd2f1187c1040628 Mon Sep 17 00:00:00 2001 From: Will Lennon Date: Mon, 3 Oct 2022 11:51:52 -0400 Subject: [PATCH 2/2] Update upgrade documentation regarding replication warning (#31113) Co-authored-by: Matt Pollard Co-authored-by: Roger D. Winans --- .../upgrading-github-enterprise-server.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md b/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md index 19e110153b..2fabe7244a 100644 --- a/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md +++ b/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md @@ -227,13 +227,18 @@ Appliances configured for high-availability and geo-replication use replica inst {% note %} - **Note:** While the resync is in progress `ghe-repl-status` may return expected messages indicating that replication is behind. - For example: `CRITICAL: git replication is behind the primary by more than 1007 repositories and/or gists` - + **Note:** While the resync is in progress `ghe-repl-status` may indicate that replication is behind. For example, you may see the following message. + + ``` + CRITICAL: git replication is behind the primary by more than 1007 repositories and/or gists + ``` {% endnote %} - If `ghe-repl-status` did not return `OK`, contact {% data variables.contact.enterprise_support %}. For more information, see "[Receiving help from {% data variables.contact.github_support %}](/admin/enterprise-support/receiving-help-from-github-support)." - + {%- ifversion ghes = 3.4 or ghes = 3.5 or ghes = 3.6 %} + + - If you have upgraded each node to {% data variables.product.product_name %} 3.6.0 or later and started replication, but `git replication is behind the primary` continues to appear after 45 minutes, contact {% data variables.contact.enterprise_support %}. For more information, see "[Receiving help from {% data variables.contact.github_support %}](/admin/enterprise-support/receiving-help-from-github-support)." + {%- endif %} + - {% ifversion ghes = 3.4 or ghes = 3.5 or ghes = 3.6 %}Otherwise, if{% else %}If{% endif %} `ghe-repl-status` did not return `OK`, contact {% data variables.contact.enterprise_support %}. For more information, see "[Receiving help from {% data variables.contact.github_support %}](/admin/enterprise-support/receiving-help-from-github-support)." 6. When you have completed upgrading the last replica, and the resync is complete, disable maintenance mode so users can use {% data variables.product.product_location %}. ## Restoring from a failed upgrade