This is an automated email from the ASF dual-hosted git repository.
yuqi4733 pushed a commit to branch branch-1.1
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/branch-1.1 by this push:
new 4b5ff8c7b6 [#9957][followup] docs: fix docs conflicts in
`lakehouse-paimon-catalog.md` (#10624)
4b5ff8c7b6 is described below
commit 4b5ff8c7b628a5f6cc043c459fe928b88d119d7e
Author: Qi Yu <[email protected]>
AuthorDate: Wed Apr 8 19:19:12 2026 +0800
[#9957][followup] docs: fix docs conflicts in `lakehouse-paimon-catalog.md`
(#10624)
### What changes were proposed in this pull request?
Resolve conflicts in `lakehouse-paimon-catalog.md`.
### Why are the changes needed?
It's a bug
Fix: #9957
### Does this PR introduce _any_ user-facing change?
N/A
### How was this patch tested?
Test manually.
---
docs/lakehouse-paimon-catalog.md | 8 --------
1 file changed, 8 deletions(-)
diff --git a/docs/lakehouse-paimon-catalog.md b/docs/lakehouse-paimon-catalog.md
index 930d5f1bce..5930a268ba 100644
--- a/docs/lakehouse-paimon-catalog.md
+++ b/docs/lakehouse-paimon-catalog.md
@@ -49,13 +49,6 @@ Builds with Apache Paimon `1.2`.
| `s3-secret-access-key` | The secret key of the
AWS S3.
| (none)
| required if the value of `warehouse` is a S3 path
[...]
:::note
-<<<<<<< HEAD
-If you want to use the `oss` or `s3` warehouse, you need to place related jars
in the `catalogs/lakehouse-paimon/lib` directory, more information can be found
in the [Paimon S3](https://paimon.apache.org/docs/master/filesystems/s3/).
-:::
-
-:::note
-The hive backend does not support the kerberos authentication now.
-=======
- If you want to use the `oss` or `s3` warehouse, you need to place related
jars in the `catalogs/lakehouse-paimon/lib` directory, more information can be
found in the [Paimon
S3](https://paimon.apache.org/docs/1.2/maintenance/filesystems/#s3).
- If you want to use REST backend, Gravitino Paimon catalog supports Aliyun
DLF (Data Lake Formation) as the REST catalog service. You need to configure
the DLF-related properties eg:
```
@@ -75,7 +68,6 @@ The hive backend does not support the kerberos authentication
now.
```
connect to Aliyun DLF, more information can be found in the [Paimon REST
Catalog](https://paimon.apache.org/docs/master/concepts/rest/overview/).
- The hive backend does not support the kerberos authentication now.
->>>>>>> 91faad83e ([#9957] fix(docs): improve lakehouse-paimon-catalog.md
(#9958))
:::
Any properties not defined by Gravitino with `gravitino.bypass.` prefix will
pass to Paimon catalog properties and HDFS configuration. For example, if
specify `gravitino.bypass.table.type`, `table.type` will pass to Paimon catalog
properties.
