Skip to content

Commit 69acfd3

Browse files
cpjuliacpjulia
committed
Merge branch 'devel' of github.com:arangodb/arangodb into feature/supervised-aql-value
2 parents 9c36db3 + 7293812 commit 69acfd3

File tree

86 files changed

+211
-218
lines changed

Some content is hidden

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

86 files changed

+211
-218
lines changed

‎CHANGELOG‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
devel
22
-----
33

4+
* Replace arangodb.com with arango.ai in URLs
5+
46
* Updated ArangoDB Starter to v0.19.15.
57

68
* Rebuilt included rclone v1.65.2 with go1.24.11 and non-vulnerable
@@ -13763,7 +13765,7 @@ v3.5.0-rc.1 (2019-05-14)
1376313765
- `--javascript.endpoints-whitelist`: control accessible endpoints in JavaScript
1376413766
- `--javascript.files-whitelist`: control file access in JavaScript
1376513767

13766-
Note: There is a [detailed description of all options](https://docs.arangodb.com/stable/operations/security/security-options/).
13768+
Note: There is a [detailed description of all options](https://docs.arango.ai/arangodb/stable/operations/security/security-options/).
1376713769

1376813770
* Prevented arangod from making a call to www.arangodb.com at startup.
1376913771

‎CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,12 @@ option(USE_ENTERPRISE "enable enterprise build" OFF)
202202

203203
# for the packages
204204
set(ARANGODB_PACKAGE_VENDOR "ArangoDB GmbH")
205-
set(ARANGODB_PACKAGE_CONTACT "info@arangodb.com")
205+
set(ARANGODB_PACKAGE_CONTACT "info@arango.ai")
206206
set(ARANGODB_DISPLAY_NAME "ArangoDB")
207-
set(ARANGODB_URL_INFO_ABOUT "https://www.arangodb.com")
208-
set(ARANGODB_HELP_LINK "https://docs.arangodb.com/${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR}/")
209-
set(ARANGODB_CONTACT "hackers@arangodb.com")
210-
set(ARANGODB_FRIENDLY_STRING "ArangoDB - the native multi-model NoSQL database")
207+
set(ARANGODB_URL_INFO_ABOUT "https://arango.ai")
208+
set(ARANGODB_HELP_LINK "https://docs.arango.ai/arangodb/${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR}/")
209+
set(ARANGODB_CONTACT "hackers@arango.ai")
210+
set(ARANGODB_FRIENDLY_STRING "ArangoDB - the native multi-model graph database")
211211

212212

213213
# binaries

‎CONTRIBUTING.md‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# Contributing
22

3-
We welcome bug fixes and patches from 3rd party contributors. Please
4-
see the [Contributor Agreement](https://www.arangodb.com/community#contribute)
5-
for details.
3+
We welcome bug fixes and patches from 3rd party contributors.
4+
Please see the applicable agreement for details:
65

7-
Please follow these guidelines if you want to contribute to ArangoDB:
6+
- [Individual Contributor License Agreement](https://arango.ai/contributor-license)
7+
- [Corporate Contributor License Agreement](https://arango.ai/corporate-cla)
8+
9+
Please follow below guidelines if you want to contribute to ArangoDB.
810

911
# Reporting Bugs
1012

@@ -39,7 +41,7 @@ yet.
3941
the appropriate branches there. This will most likely be **devel**.
4042

4143
- You must use the Apache License for your changes and have signed our
42-
[CLA](https://arangodb.com/community/#contribute). We cannot accept pull requests
44+
[CLA](#contributing). We cannot accept pull requests
4345
from contributors who didn't sign the CLA.
4446

4547
- Please let us know if you plan to work on a ticket. This way we can make sure
@@ -557,7 +559,7 @@ SIGABRT. SIGKILL signals, which the operating system can send to a process in ca
557559

558560
In case the crash handler receives one of the mentioned interceptable signals, it will
559561
write basic crash information to the logfile and a backtrace of the call site.
560-
The backtrace can be provided to the ArangoDB support for further inspection. Note that
562+
The backtrace can be provided to the Arango support for further inspection. Note that
561563
backtraces are only usable if debug symbols for ArangoDB have been installed as well.
562564

563565
After logging the crash information, the crash handler will execute the default action for
@@ -1337,10 +1339,10 @@ arangodb directory.
13371339

13381340
# Additional Resources
13391341

1340-
- [ArangoDB website](https://www.arangodb.com/)
1342+
- [Arango website](https://arango.ai/)
13411343

1342-
- [ArangoDB on Twitter](https://twitter.com/arangodb)
1344+
- [Arango on X](https://x.com/arangoai)
13431345

13441346
- [General GitHub documentation](https://help.github.com/)
13451347

1346-
- [GitHub pull request documentation](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork/)
1348+
- [GitHub pull request documentation](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork)

‎Documentation/Metrics/arangodb_replication_failed_connects_total.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ troubleshoot: |
3131
and the machines can communicate to one-another.
3232
* Second: Check ArangoDB logs of this server for more details, most likely
3333
you see `WARN` or `ERROR` messages in the `replication` log topic. If you contact
34-
ArangoDB support for this issue, it helps to include these servers logs as well.
34+
the Arango support for this issue, it helps to include these servers logs as well.
3535
* Third: (Unlikely) If the logs contain unexpected format or value entries
3636
please check if you are running all ArangoDB DB-Servers within the same
3737
version of ArangoDB. Only upgrades of one minor version at a time are supported
3838
in general, so if you are running one server with a much newer / older version
3939
please upgrade all servers to the newest version.
40-
* Forth: If none of the above applies, please contact ArangoDB Support.
40+
* Forth: If none of the above applies, please contact the Arango support.

‎Documentation/Metrics/arangodb_rocksdb_write_stops_total.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ threshold: |
2626
ArangoDB than RocksDB can keep up with its background processing.
2727
This has lead to actual write stops, which are bad since they can lead
2828
to unavailability. If you see this number grow, you need to act,
29-
if in doubt, contact ArangoDB support.
29+
if in doubt, contact the Arango support.
3030
troubleshoot: |
3131
Quite often, RocksDB is limited by the available I/O bandwidth. Sometimes,
3232
it is not the bandwidth itself, but the number of I/O operations per

‎Documentation/Metrics/arangodb_shards_leader_number.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ troubleshoot: |
2525
in the ArangoDB web interface, or use the
2626
[cluster maintenance tools](https://github.com/arangodb/cluster-maintenance)
2727
(`create-move-plan` and `execute-move-plan` specifically). In the latter
28-
case, contact ArangoDB customer support.
28+
case, contact the Arango customer support.

‎Documentation/Metrics/arangodb_shards_not_replicated.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ troubleshoot: |
2121
and waiting is a good measure at first. However, if the situation
2222
persists, something is wrong, potentially some constant server crash
2323
(maybe out of memory crashes?) or another situation preventing
24-
shards to get in sync. Contact ArangoDB customer support in this case.
24+
shards to get in sync. Contact the Arango customer support in this case.

‎Documentation/Metrics/arangodb_shards_number.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ troubleshoot: |
2121
ArangoDB web interface, or use the
2222
[cluster maintenance tools](https://github.com/arangodb/cluster-maintenance)
2323
(`create-move-plan` and `execute-move-plan` specifically). In the latter
24-
case, contact ArangoDB customer support.
24+
case, contact the Arango customer support.

‎Documentation/Metrics/arangodb_shards_out_of_sync.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ troubleshoot: |
2222
and waiting is a good measure at first. However, if the situation
2323
persists, something is wrong, potentially some constant server crash
2424
(maybe out of memory crashes?) or another situation preventing shards
25-
to get in sync. Contact ArangoDB customer support in this case.
25+
to get in sync. Contact the Arango customer support in this case.

‎Documentation/Metrics/arangodb_sync_rebuilds_total.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ description: |
2222
troubleshoot: |
2323
This number is always `0` from version 3.9.3 onwards. If it is
2424
non-zero in previous versions, then something is wrong, please
25-
contact ArangoDB customer support in this case.
25+
contact the Arango customer support in this case.

0 commit comments

Comments
 (0)