This is an automated email from the ASF dual-hosted git repository.

kerwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git


The following commit(s) were added to refs/heads/master by this push:
     new 995209194 [doc] Update overview.md
995209194 is described below

commit 99520919430814705461df49bd62b12f8e4dd85a
Author: Kerwin <[email protected]>
AuthorDate: Thu Oct 26 12:50:43 2023 +0800

    [doc] Update overview.md
---
 docs/content/engines/overview.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/content/engines/overview.md b/docs/content/engines/overview.md
index 4d48ff769..e6173f4e2 100644
--- a/docs/content/engines/overview.md
+++ b/docs/content/engines/overview.md
@@ -35,8 +35,7 @@ Apache Spark and Apache Hive.
 | Engine |    Version    | Batch Read | Batch Write | Create Table | Alter 
Table | Streaming Write | Streaming Read | Batch Overwrite |
 
|:------:|:-------------:|:----------:|:-----------:|:------------:|:-----------:|:---------------:|:--------------:|:---------------:|
 | Flink  |  1.14 - 1.18  |     ✅      |      ✅      |      ✅       |  ✅(1.17+) 
  |        ✅        |       ✅        |        ✅        |
-| Spark  |   3.1 - 3.5   |     ✅      |      ✅      |      ✅       |      ✅    
  |        ✅         |    ✅(3.3+)     |        ❌        |
->>>>>>> 63465c879 ([flink] Update Flink to 1.18.0)
+| Spark  |   3.1 - 3.5   |     ✅      |      ✅      |      ✅       |      ✅    
  |        ✅        |    ✅(3.3+)     |        ❌        |
 |  Hive  |   2.1 - 3.1   |     ✅      |      ✅      |      ✅       |      ❌    
  |        ❌        |       ❌        |        ❌        |
 | Spark  |      2.4      |     ✅      |      ❌      |      ❌       |      ❌    
  |        ❌        |       ❌        |        ❌        |
 | Trino  |   358 - 422   |     ✅      |      ❌      |      ✅       |      ✅    
  |        ❌        |       ❌        |        ❌        |

Reply via email to