Skip to content

Commit d8a78ed

Browse files
authored
Merge pull request #1524 from EnterpriseDB/release/2021-07-01
Release: 2021-07-01 Former-commit-id: 4697aeb
2 parents 4b3c38e + 54fa115 commit d8a78ed

File tree

409 files changed

+1254
-2598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

409 files changed

+1254
-2598
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"appPort": [8000],
2222

2323
// Use 'postCreateCommand' to run commands after the container is created.
24-
"postCreateCommand": "yarn install && git submodule update --init",
24+
"postCreateCommand": "yarn install",
2525

2626
// docker in docker (https://github.com/microsoft/vscode-dev-containers/blob/master/script-library/docs/docker-in-docker.md)
2727
"runArgs": ["--init", "--privileged"],

.github/workflows/deploy-develop.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ jobs:
1515
with:
1616
ref: develop
1717
fetch-depth: 0 # fetch whole repo so git-restore-mtime can work
18-
- name: Update submodules
19-
run: git submodule update --init --remote
2018
- name: Adjust file watchers limit
2119
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
2220

.github/workflows/deploy-main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ jobs:
1515
with:
1616
ref: main
1717
fetch-depth: 0 # fetch whole repo so git-restore-mtime can work
18-
- name: Update submodules
19-
run: git submodule update --init --remote
2018
- name: Adjust file watchers limit
2119
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
2220

.github/workflows/update-pdfs-on-develop.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ jobs:
1919
with:
2020
ref: develop
2121
ssh-key: ${{ secrets.ADMIN_SECRET_SSH_KEY }}
22-
- name: Update submodules
23-
run: git submodule update --init --remote
2422

2523
- uses: actions/setup-node@v1
2624
with:

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ We recommend using MacOS to work with the EDB Docs application.
3434

3535
1. Install all required packages by running `yarn`.
3636

37-
1. Pull the shared icon files down with `git submodule update --init`. This needs to be run inside of the project folder, if you have cloned the repo using GitHub Desktop, ensure that you have `cd` into the project.
38-
3937
1. And finally, you can start up the site locally with `yarn develop`, which should make it live at `http://localhost:8000/`. Huzzah!
4038

4139
### Installation of PDF / Doc Conversion Tools (optional)

advocacy_docs/community/contributing/repo.mdx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,15 @@ Example:
6060
```shell
6161
yarn
6262
```
63-
12. Pull down shared icon files
64-
```shell
65-
git submodule update --init
66-
```
67-
13. Select sources with yarn
63+
12. Select sources with yarn
6864
```shell
6965
yarn config-sources
7066
```
7167
You'll be prompted to choose the packages you'd like to access; you can use comma separated values to choose more than one
7268
```shell
7369
yarn develop
7470
```
75-
14. Go to the localhost port in your browser, e.g. http://localhost:8000/ (your url will be mentioned in Terminal)
71+
13. Go to the localhost port in your browser, e.g. http://localhost:8000/ (your url will be mentioned in Terminal)
7672

7773
### Tips to Use Terminal
7874
- <kbd>⌘</kbd>+<kbd>T</kbd> (press the command key and T key together) opens a new tab - use this to execute terminal commands while <code>yarn develop</code> is running
@@ -81,10 +77,10 @@ Example:
8177
## How to Make changes and Submit Pull Requests
8278
You'll make edits and additions via your IDE (VS Code). We recommend using [Github Desktop](https://desktop.github.com/) unless you're familiar with git.
8379

84-
15. Get in the habit of pulling the latest changes from the `develop` branch of the Github repository on a regular basis, so that you don't have to manually merge your changes with those made by others. Use the "Fetch origin" and "Pull origin" buttons in Github Desktop at the start of your work day to update your local files with those from the server. You should also do this again before submitting a pull request. For details, see: [Syncing your branch
80+
14. Get in the habit of pulling the latest changes from the `develop` branch of the Github repository on a regular basis, so that you don't have to manually merge your changes with those made by others. Use the "Fetch origin" and "Pull origin" buttons in Github Desktop at the start of your work day to update your local files with those from the server. You should also do this again before submitting a pull request. For details, see: [Syncing your branch
8581
](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/syncing-your-branch)
8682

87-
16. To submit a pull request
83+
15. To submit a pull request
8884
- Make changes to the repository in VS code (or your IDE of choice)
8985
- Save changes (<kbd>CTRL</kbd>+<kbd>S</kbd> in VS Code)
9086
- Create a new branch and name it in Github Desktop

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"build": "gatsby build --prefix-paths",
1717
"serve-build": "gatsby serve --prefix-paths",
1818
"prepare": "husky install",
19-
"update-icons": "git submodule update --init --remote && node scripts/createIconTypes.js && node scripts/createIconNames.js",
19+
"update-icons": "node scripts/createIconTypes.js && node scripts/createIconNames.js",
2020
"build-pdf": "docker-compose -f docker/docker-compose.build-pdf.yaml run --rm --entrypoint scripts/pdf/generate_pdf.py pdf-builder",
2121
"build-all-pdfs": "for i in product_docs/docs/**/*/ ; do echo \"$i\"; yarn build-pdf ${i%} || exit 1; done",
2222
"build-all-pdfs-ci": "for i in product_docs/docs/**/*/ ; do echo \"$i\"; python3 scripts/pdf/generate_pdf.py ${i%} || exit 1; done",

product_docs/docs/efm/4.1/efm_pgpool_ha_guide/03_components_ha_pgpool.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ There are three PostgreSQL backend nodes, one Primary and two Standby nodes. Con
3636
backend_hostname0 = ‘server1_IP'
3737
backend_port0 = 5444
3838
backend_weight0 = 1
39-
backend_flag0 = 'DISALLOW_TO_FAILOVER'
39+
backend_flag0 = 'ALLOW_TO_FAILOVER'
4040
4141
backend_hostname1 = ‘server2_IP'
4242
backend_port1 = 5444
4343
backend_weight1 = 1
44-
backend_flag1 = 'DISALLOW_TO_FAILOVER'
44+
backend_flag1 = 'ALLOW_TO_FAILOVER'
4545
4646
backend_hostname2 = ‘server3_IP'
4747
backend_port2 = 5444
4848
backend_weight2 = 1
49-
backend_flag2 = 'DISALLOW_TO_FAILOVER'
49+
backend_flag2 = 'ALLOW_TO_FAILOVER'
5050
```
5151

5252
**Enable Load-balancing and streaming replication mode**
@@ -65,7 +65,7 @@ Health-checking and failover must be handled by EFM and hence, these must be dis
6565

6666
```text
6767
health_check_period = 0
68-
fail_over_on_backend_error = off
68+
failover_on_backend_error = off
6969
failover_if_affected_tuples_mismatch = off
7070
failover_command = ‘’
7171
failback_command = ‘’

product_docs/docs/efm/4.2/efm_pgpool_ha_guide/03_components_ha_pgpool.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ There are three PostgreSQL backend nodes, one Primary and two Standby nodes. Con
3232
backend_hostname0 = ‘server1_IP'
3333
backend_port0 = 5444
3434
backend_weight0 = 1
35-
backend_flag0 = 'DISALLOW_TO_FAILOVER'
35+
backend_flag0 = 'ALLOW_TO_FAILOVER'
3636
3737
backend_hostname1 = ‘server2_IP'
3838
backend_port1 = 5444
3939
backend_weight1 = 1
40-
backend_flag1 = 'DISALLOW_TO_FAILOVER'
40+
backend_flag1 = 'ALLOW_TO_FAILOVER'
4141
4242
backend_hostname2 = ‘server3_IP'
4343
backend_port2 = 5444
4444
backend_weight2 = 1
45-
backend_flag2 = 'DISALLOW_TO_FAILOVER'
45+
backend_flag2 = 'ALLOW_TO_FAILOVER'
4646
```
4747

4848
**Enable Load-balancing and streaming replication mode**
@@ -70,7 +70,7 @@ Health-checking and failover must be handled by EFM and hence, these must be dis
7070

7171
```text
7272
health_check_period = 0
73-
fail_over_on_backend_error = off
73+
failover_on_backend_error = off
7474
failover_if_affected_tuples_mismatch = off
7575
failover_command = ‘’
7676
failback_command = ‘’

0 commit comments

Comments
 (0)