Skip to content

Commit 5d3903f

Browse files
renetapopovaNataliaIvakinanick-giles-neolidiazuinmikeblum
authored
5.x merge dev (#1740)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: NataliaIvakina <[email protected]> Co-authored-by: Nick Giles <[email protected]> Co-authored-by: Lidia Zuin <[email protected]> Co-authored-by: Michael Blum <[email protected]> Co-authored-by: Valdemar Roxling <[email protected]> Co-authored-by: David Pond <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Neil Dewhurst <[email protected]> Co-authored-by: Matthew Parnell <[email protected]> Co-authored-by: Jessica Wright <[email protected]> Co-authored-by: Matthew Parnell <[email protected]> Co-authored-by: Bruno Caricchio Buss <[email protected]> Co-authored-by: Mark Dixon <[email protected]> Co-authored-by: Phil Wright <[email protected]> Co-authored-by: Balazs Lendvai <[email protected]> Co-authored-by: Stefano Ottolenghi <[email protected]> Co-authored-by: Christophe Willemsen <[email protected]> Co-authored-by: Fi Quick <[email protected]> Co-authored-by: Jenny Owen <[email protected]> Co-authored-by: Love Kristofer Leifland <[email protected]> Co-authored-by: Florent Biville <[email protected]> Co-authored-by: Hannes Sandberg <[email protected]> Co-authored-by: Therese Magnusson <[email protected]> Co-authored-by: Richard Sill <[email protected]> Co-authored-by: Therese Magnusson <[email protected]> Co-authored-by: davidlrosenblum <[email protected]> Co-authored-by: Jack Waudby <[email protected]> Co-authored-by: gjmwoods <[email protected]> Co-authored-by: Satia Herfert <[email protected]> Co-authored-by: Alexander Bouriakov <[email protected]> Co-authored-by: Jack Waudby <[email protected]> Co-authored-by: Arne Fischereit <[email protected]> Co-authored-by: Bastien Louërat <[email protected]> Co-authored-by: Aleksey Karasavov <[email protected]> Co-authored-by: Lasse Heemann <[email protected]> Co-authored-by: Nathan Smith <[email protected]>
1 parent ee6af73 commit 5d3903f

File tree

24 files changed

+204
-59
lines changed

24 files changed

+204
-59
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./.github/ @recrwplay

.github/dependabot.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "npm" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"
12+
groups:
13+
prod-dependencies:
14+
dependency-type: "production"
15+
dev-dependencies:
16+
dependency-type: "development"

.github/workflows/docs-branch-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ jobs:
5050
if: ${{ inputs.lint || github.event_name == 'push' }}
5151
name: Lint docs
5252
uses: neo4j/docs-tools/.github/workflows/[email protected]
53-
53+

.github/workflows/docs-deploy-surge.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
3535
owner: context.repo.owner,
3636
repo: context.repo.repo,
37-
run_id: ${{ github.event.workflow_run.id }},
37+
run_id: ${{ env.RUN_ID }},
3838
});
3939
4040
var matchArtifactDocs = artifacts.data.artifacts.filter((artifact) => {
@@ -71,13 +71,13 @@ jobs:
7171
- id: unzip-changelog
7272
if: ${{ hashFiles('changelog.zip') != '' }}
7373
run: unzip changelog.zip
74-
74+
7575
- id: get-deploy-id
7676
run: |
7777
deployid=$(<deployid)
7878
case "$deployid" in ''|*[!0-9]*) echo "Provided PR number is not an integer"; exit 1 ;; esac
7979
echo "deploy-id=$deployid" >> "$GITHUB_OUTPUT"
80-
80+
8181
- id: get-deploy-url
8282
env:
8383
ORG: ${{ github.event.repository.owner.login }}
@@ -86,11 +86,11 @@ jobs:
8686
run: |
8787
deployurl=$ORG-$REPO-$DEPLOYID.surge.sh
8888
echo "deploy-url=$deployurl" >> $GITHUB_OUTPUT
89-
89+
9090
- uses: actions/setup-node@v4
9191
with:
9292
node-version: lts/*
93-
93+
9494
- name: Deploy docs to surge
9595
shell: bash
9696
env:
@@ -124,6 +124,5 @@ jobs:
124124
header: docs-pr-changes
125125
message: |
126126
Looks like you've updated the documentation!
127-
128127
Check out your changes at https://${{ env.DEPLOY_URL }}
129128
GITHUB_TOKEN: ${{ secrets.DOCS_PR_COMMENT_TOKEN }}

.github/workflows/docs-pr-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ jobs:
5858
uses: neo4j/docs-tools/.github/workflows/[email protected]
5959
with:
6060
pages-modified: ${{ needs.docs-changes-pr.outputs.pages-modified }}
61-
pages-added: ${{ needs.docs-changes-pr.outputs.pages-added }}
61+
pages-added: ${{ needs.docs-changes-pr.outputs.pages-added }}

.github/workflows/docs-teardown.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
run: |
2424
deployurl=$ORG-$REPO-$DEPLOYID.surge.sh
2525
echo "deploy-url=$deployurl" >> $GITHUB_OUTPUT
26-
2726
- name: Teardown documentation
2827
shell: bash
2928
env:
@@ -43,4 +42,4 @@ jobs:
4342
4443
The preview documentation has now been torn down - reopening this PR will republish it.
4544
GITHUB_TOKEN: ${{ secrets.DOCS_PR_COMMENT_TOKEN }}
46-
45+

antora.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ nav:
77
asciidoc:
88
attributes:
99
neo4j-version: '5'
10-
neo4j-version-minor: '5.21'
11-
neo4j-version-exact: '5.21.0'
12-
neo4j-buildnumber: '5.21'
13-
neo4j-debian-package-version: '1:5.21.0@'
10+
neo4j-version-minor: '5.22'
11+
neo4j-version-exact: '5.22.0'
12+
neo4j-buildnumber: '5.22'
13+
neo4j-debian-package-version: '1:5.22.0@'

modules/ROOT/pages/backup-restore/copy-database.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,10 @@ If you go from `high_limit` to `standard` or `aligned`, there is no validation t
203203
|
204204
|===
205205

206+
[role=label--enterprise-edition]
206207
[NOTE]
207208
====
208-
The block format is introduced in Neo4j 5.14 and is only available in Neo4j Enterprise Edition.
209+
The block format is introduced in Neo4j 5.14 and from Neo4j 5.22, is the default format for all newly-created databases as long as they do not have the xref:configuration/configuration-settings.adoc#config_db.format[`db.format`] setting specified.
209210
For more information on the block format, see xref:database-internals/store-formats.adoc[Store formats].
210211
====
211212

@@ -303,7 +304,7 @@ For more information, see xref:clustering/databases.adoc#cluster-seed[Designated
303304

304305
[NOTE]
305306
====
306-
Note that even though it is only one database copy in the end, you still need double the space during the operation.
307+
Note that even though there is only one database copy in the end, you still need double the space during the operation.
307308
====
308309

309310
. Stop the database named `neo4j`:
@@ -327,7 +328,7 @@ If omitted, the current working directory will be used.
327328
328329
From Neo4j 5.20 onwards, you can use the `--copy-schema` option to automatically copy the schema.
329330
Indexes will be built the first time the database is started.
330-
This option can copy the schema from any 4.4 and 5.x version to 5.20 and later versions.
331+
This option can copy the schema from any 4.4 and 5.x to 5.20 and later versions.
331332
332333
For previous versions, you need to manually recreate the schema using the Cyher statements saved in the file _<database-name>-schema.cypher_.
333334
====

modules/ROOT/pages/backup-restore/online-backup.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ The `--to-path=<path>` option can also back up databases into AWS S3 buckets (fr
192192
For more information, see <<online-backup-cloud-storage>>.
193193
====
194194

195-
196195
[[backup-command-exit-codes]]
197196
=== Exit codes
198197

modules/ROOT/pages/clustering/disaster-recovery.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Note that this may take a few minutes.
153153
Once the `system` database is verified available, and all servers are online, the databases can be managed.
154154
The steps here aim to make the unavailable databases available.
155155

156-
. If you have previously dropped databases as part of this guide, re-create each one from backup.
156+
. If you have previously dropped databases as part of this guide, re-create each one from a backup.
157157
See the xref:database-administration/standard-databases/create-databases.adoc[Create databases] section for more information on how to create a database.
158158
. Run `SHOW DATABASES`.
159159
If all databases are in desired states on all servers (`requestedStatus`=`currentStatus`), disaster recovery is complete.

0 commit comments

Comments
 (0)