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

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

commit 6b5e8401859e9203fc3a1defae0de5d7cb1a0f35
Merge: 6c237e7 6aaf65a
Author: peacewong <[email protected]>
AuthorDate: Tue Dec 21 15:26:16 2021 +0800

    Merge pull request #64 from apache/dev
    
    merger dev into master

 README.md                                          |   8 +
 README_ZH.md                                       |  11 +
 community/how-to-contribute.md                     | 234 +++++-----
 community/how-to-release.md                        |  32 +-
 docs/architecture/commons/message_scheduler.md     |   2 +-
 docs/architecture/commons/rpc.md                   |   2 +-
 .../engine/Images/ECM-01.png                       | Bin 34340 -> 0 bytes
 .../engine/Images/ECM-02.png                       | Bin 25340 -> 0 bytes
 .../engine/engine_conn_manager.md                  |   2 +-
 .../computation_governance_services/entrance.md    |   7 +-
 .../computation_governance_services/linkis-cli.md  |   2 +-
 .../linkis_manager/app_manager.md                  |   4 +-
 .../linkis_manager/overview.md                     |   7 +-
 .../linkis_manager/resource_manager.md             |  12 +-
 .../computation_governance_services/overview.md    |   4 +-
 .../context_service/context_service_listener.md    |   4 +-
 docs/deployment/quick_deploy.md                    |   2 +-
 .../sourcecode_hierarchical_structure.md           |  65 +++
 docs/deployment/web_install.md                     |   2 +-
 docs/engine_usage/hive.md                          |  72 +--
 docs/engine_usage/jdbc.md                          |  58 ++-
 docs/engine_usage/python.md                        |  55 ++-
 docs/engine_usage/shell.md                         |  53 ++-
 docs/engine_usage/spark.md                         |  65 +--
 docs/introduction.md                               |   4 +-
 docs/tuning_and_troubleshooting/overview.md        |   2 +-
 docs/user_guide/how_to_use.md                      |   6 +-
 docs/user_guide/sdk_manual.md                      | 498 +++++++++-----------
 docusaurus.config.js                               |   2 +-
 download/main.md                                   |   2 +-
 download/release-1.0.2.md                          |   1 +
 .../current/how-to-contribute.md                   | 242 +++++-----
 .../current/main.md                                |   2 +-
 .../current/release-1.0.2.md                       |  68 +--
 .../engine/engine_conn_manager.md                  |   4 +-
 .../ecm\346\236\266\346\236\204\345\233\276.png"   | Bin 34340 -> 0 bytes
 ...57\267\346\261\202\346\265\201\347\250\213.png" | Bin 25340 -> 0 bytes
 .../linkis_manager/resource_manager.md             |  36 +-
 .../context_service/context_service.md}            |   0
 .../sourcecode_hierarchical_structure.md           |  69 +++
 .../current/deployment/web_install.md              |   2 +-
 .../current/engine_usage/hive.md                   |  32 +-
 .../current/engine_usage/jdbc.md                   |  37 +-
 .../current/engine_usage/python.md                 |  32 +-
 .../current/engine_usage/shell.md                  |  30 +-
 .../current/engine_usage/spark.md                  |  36 +-
 .../current/introduction.md                        |   4 +-
 .../current/tuning_and_troubleshooting/overview.md |   2 +-
 .../current/user_guide/sdk_manual.md               | 483 +++++++++-----------
 .../engine/engine_conn_manager.md                  |   4 +-
 .../ecm\346\236\266\346\236\204\345\233\276.png"   | Bin 34340 -> 0 bytes
 .../linkis_manager/resource_manager.md             |  36 +-
 .../context_service/context_service.md}            |   0
 .../version-1.0.2/deployment/cluster_deployment.md |   3 +-
 .../sourcecode_hierarchical_structure.md           |  63 +++
 .../version-1.0.2/deployment/web_install.md        |   2 +-
 .../development_meetup/phase_one/chapter1.md       |   1 -
 .../development_meetup/phase_one/chapter2.md       |   1 -
 .../development_meetup/phase_one/readme.md         |  56 ---
 .../development_meetup/phase_two/chapter1.md       | 371 ---------------
 .../development_meetup/phase_two/chapter2.md       | 251 -----------
 .../development_meetup/phase_two/images/issue.png  | Bin 102094 -> 0 bytes
 .../development_meetup/phase_two/images/q&a.png    | Bin 161638 -> 0 bytes
 .../phase_two/images/\345\217\214\346\264\273.png" | Bin 130148 -> 0 bytes
 .../images2/0ca28635de253f245743fbf0a7cfe165.png   | Bin 98316 -> 0 bytes
 .../images2/146a58addcacbc560a33604b00636dee.png   | Bin 44890 -> 0 bytes
 .../images2/1730acb1c4ff58a055fa71324e5c7f2c.png   | Bin 95491 -> 0 bytes
 .../images2/1d31b398318acbd862f20ac05decbce9.png   | Bin 7741 -> 0 bytes
 .../images2/1d8f043dae5afdf07371ad31b06bad6e.png   | Bin 74243 -> 0 bytes
 .../images2/232983a712a949196159f0aeab7de7f5.png   | Bin 150575 -> 0 bytes
 .../images2/2767bac623d10bf45033cf9fdd8d197f.png   | Bin 120905 -> 0 bytes
 .../images2/335dabbf46b5af11e494cdd1be2c32a1.png   | Bin 118394 -> 0 bytes
 .../images2/491e9a0fbd5b0121f228e0f7938cf168.png   | Bin 120419 -> 0 bytes
 .../images2/781914abed8ec4955cac520eb0a1be7e.png   | Bin 770399 -> 0 bytes
 .../images2/7b8685204636771776605bab99b08e8f.png   | Bin 82550 -> 0 bytes
 .../images2/7cbe7cd81ce2212883741dd9b62dad18.png   | Bin 36588 -> 0 bytes
 .../images2/8576fe8054c072a7fee53d98eeefa004.png   | Bin 39623 -> 0 bytes
 .../images2/87ef54ccaa6b96abc30e612636bb2e90.png   | Bin 103943 -> 0 bytes
 .../images2/9693ded0c6a9c32cb1ff33713e5d3864.png   | Bin 54885 -> 0 bytes
 .../images2/9c254ec33125eb0ab50a6bcc0e95a18a.png   | Bin 145675 -> 0 bytes
 .../images2/a0fb7e3474dff5c22fb3c230f73fa6f6.png   | Bin 55052 -> 0 bytes
 .../images2/b68f441d7ac6b4814c048d35cebbb25d.png   | Bin 117177 -> 0 bytes
 .../images2/b7feb36a0322b002f9f85f0a8003dcc1.png   | Bin 169905 -> 0 bytes
 .../images2/ba90e28a78375103c4890cd448818ab3.png   | Bin 132653 -> 0 bytes
 .../images2/c3f5ac1723ba9823084f529f5384440d.png   | Bin 21078 -> 0 bytes
 .../images2/cd3ea323b238158c8a3de8acc8ec0a3f.png   | Bin 20051 -> 0 bytes
 .../images2/d0fe37b4aa34b0cea9e87247b7b17943.png   | Bin 115496 -> 0 bytes
 .../images2/d1b4759745056add53a32a76d3699109.png   | Bin 23378 -> 0 bytes
 .../images2/d9bab9306cc28ecdf8d3679ecfc224d4.png   | Bin 97351 -> 0 bytes
 .../images2/da0cf9cb7b27dac266435b5f6ad1cd82.png   | Bin 45877 -> 0 bytes
 .../images2/de301f8f21c1735c5e018188d685ad74.png   | Bin 53369 -> 0 bytes
 .../images2/e7e2a98ce1f03d228c7c2d782b076d53.png   | Bin 81483 -> 0 bytes
 .../images2/f395c9cc338d85e258485658290bf365.png   | Bin 43688 -> 0 bytes
 .../images2/f6fa083cab060a5adc9d483b37d040f5.png   | Bin 60331 -> 0 bytes
 .../images2/fb952c266ce9a8db9b9036a602e222a7.png   | Bin 131953 -> 0 bytes
 .../development_meetup/phase_two/readme.md         |  58 ---
 .../version-1.0.2/development_meetup/readme.md     |   1 -
 .../version-1.0.2/engine_usage/hive.md             |  32 +-
 .../version-1.0.2/engine_usage/jdbc.md             |  37 +-
 .../version-1.0.2/engine_usage/python.md           |  32 +-
 .../version-1.0.2/engine_usage/shell.md            |  30 +-
 .../version-1.0.2/engine_usage/spark.md            |  36 +-
 .../version-1.0.2/introduction.md                  |   4 +-
 .../tuning_and_troubleshooting/overview.md         |   2 +-
 .../version-1.0.2/user_guide/sdk_manual.md         | 482 +++++++++-----------
 resource/Linkis Architecture-v1.0.0.vsdx           | Bin 0 -> 2355962 bytes
 resource/Linkis Master.vsdx                        | Bin 0 -> 162682 bytes
 resource/RM Module.vsdx                            | Bin 0 -> 36834 bytes
 .../Images-zh/Architecture/Commons/linkis-rpc.png  | Bin 23403 -> 19406 bytes
 .../Images-zh/Architecture/engine/ecm-01.png       | Bin
 .../Architecture/engine/engineconn-01.png          | Bin
 static/Images-zh/Architecture/rm-01.png            | Bin 183082 -> 149793 bytes
 static/Images-zh/Architecture/rm-02.png            | Bin 71086 -> 42603 bytes
 static/Images-zh/Architecture/rm-03.png            | Bin 52466 -> 18667 bytes
 static/Images-zh/Architecture/rm-04.png            | Bin 36324 -> 18047 bytes
 .../add_an_EngineConn_flow_chart.png               | Bin 59893 -> 22820 bytes
 static/Images/Architecture/AppManager-02.png       | Bin 0 -> 130292 bytes
 static/Images/Architecture/AppManager-03.png       | Bin 0 -> 70502 bytes
 .../Commons/linkis-message-scheduler.png           | Bin 0 -> 26987 bytes
 static/Images/Architecture/Commons/linkis-rpc.png  | Bin 0 -> 19406 bytes
 .../Architecture/EngineConn/engineconn-01.png      | Bin 157753 -> 117965 bytes
 .../Gateway/gateway_server_dispatcher.png          | Bin 83743 -> 89005 bytes
 .../execution.png                                  | Bin 31078 -> 27251 bytes
 .../orchestrate.png                                | Bin 31095 -> 28111 bytes
 .../overall.png                                    | Bin 231192 -> 263375 bytes
 .../result_acquisition.png                         | Bin 41007 -> 91171 bytes
 .../submission.png                                 | Bin 12946 -> 11762 bytes
 .../Linkis0.X-NewEngine-architecture.png           | Bin 244826 -> 205148 bytes
 .../Linkis1.0-EngineConn-architecture.png          | Bin 157753 -> 52798 bytes
 .../Linkis1.0-NewEngine-architecture.png           | Bin 26523 -> 107003 bytes
 .../Linkis1.0-newEngine-initialization.png         | Bin 48313 -> 22820 bytes
 .../Architecture/Linkis1.0-services-list.png       | Bin 85890 -> 242558 bytes
 .../Architecture/LinkisManager/AppManager-01.png   | Bin 0 -> 70502 bytes
 .../LinkisManager/LinkisManager-01.png             | Bin 0 -> 139148 bytes
 .../LinkisManager/ResourceManager-01.png           | Bin 0 -> 60825 bytes
 .../Architecture/PublicEnhencementArchitecture.png | Bin 47158 -> 30919 bytes
 .../linkis-contextservice-cache-01.png             | Bin 11881 -> 11398 bytes
 .../linkis-contextservice-cache-02.png             | Bin 23902 -> 23223 bytes
 .../linkis-contextservice-cache-03.png             | Bin 109334 -> 111797 bytes
 .../linkis-contextservice-cache-04.png             | Bin 36161 -> 36094 bytes
 .../linkis-contextservice-cache-05.png             | Bin 2265 -> 2351 bytes
 .../linkis-contextservice-client-01.png            | Bin 54438 -> 25053 bytes
 .../linkis-contextservice-client-02.png            | Bin 93036 -> 85824 bytes
 .../linkis-contextservice-client-03.png            | Bin 34839 -> 18518 bytes
 .../ContextService/linkis-contextservice-ha-01.png | Bin 38439 -> 34741 bytes
 .../ContextService/linkis-contextservice-ha-03.png | Bin 91788 -> 40037 bytes
 .../ContextService/linkis-contextservice-ha-04.png | Bin 40733 -> 25028 bytes
 .../linkis-contextservice-listener-01.png          | Bin 24414 -> 25864 bytes
 .../linkis-contextservice-listener-02.png          | Bin 46152 -> 47398 bytes
 .../linkis-contextservice-listener-03.png          | Bin 32597 -> 28131 bytes
 .../linkis-contextservice-persistence-01.png       | Bin 198797 -> 203842 bytes
 .../linkis-contextservice-search-01.png            | Bin 33731 -> 29090 bytes
 .../linkis-contextservice-search-02.png            | Bin 26768 -> 105240 bytes
 .../linkis-contextservice-search-03.png            | Bin 33312 -> 18846 bytes
 .../linkis-contextservice-service-01.png           | Bin 56235 -> 47531 bytes
 .../linkis-contextservice-service-02.png           | Bin 73463 -> 75760 bytes
 static/Images/Architecture/engine/ecm-01.png       | Bin 0 -> 30314 bytes
 .../Images/Architecture/engine/engineconn-01.png   | Bin
 static/Images/Architecture/linkis-client-01.png    | Bin 0 -> 69647 bytes
 .../Architecture/linkis-computation-gov-02.png     | Bin 0 -> 263375 bytes
 .../Architecture/linkis-engineConnPlugin-01.png    | Bin 21864 -> 16256 bytes
 static/Images/Architecture/linkis-entrance-01.png  | Bin 0 -> 26204 bytes
 .../Architecture/linkis-microservice-gov-01.png    | Bin 109909 -> 82345 bytes
 static/Images/Architecture/rm-01.png               | Bin 0 -> 159560 bytes
 static/Images/Architecture/rm-02.png               | Bin 0 -> 41339 bytes
 static/Images/Architecture/rm-03.png               | Bin 0 -> 19701 bytes
 static/Images/Architecture/rm-04.png               | Bin 0 -> 29447 bytes
 static/Images/Architecture/rm-05.png               | Bin 0 -> 34066 bytes
 static/Images/Architecture/rm-06.png               | Bin 0 -> 44105 bytes
 static/Images/EngineUsage/hive-config.png          | Bin 86864 -> 61150 bytes
 static/Images/EngineUsage/hive-run.png             | Bin 94294 -> 54626 bytes
 static/Images/EngineUsage/jdbc-conf.png            | Bin 91609 -> 69300 bytes
 static/Images/EngineUsage/jdbc-run.png             | Bin 56438 -> 27676 bytes
 static/Images/EngineUsage/pyspakr-run.png          | Bin 124979 -> 59419 bytes
 static/Images/EngineUsage/python-config.png        | Bin 92997 -> 74445 bytes
 static/Images/EngineUsage/python-run.png           | Bin 89641 -> 36400 bytes
 static/Images/EngineUsage/queue-set.png            | Bin 93935 -> 28669 bytes
 static/Images/EngineUsage/scala-run.png            | Bin 125060 -> 65369 bytes
 static/Images/EngineUsage/shell-run.png            | Bin 209553 -> 49023 bytes
 static/Images/EngineUsage/spark-conf.png           | Bin 99930 -> 80424 bytes
 static/Images/EngineUsage/sparksql-run.png         | Bin 121699 -> 55327 bytes
 .../Images/manual/ECM_all_engine_information.png   | Bin 35445 -> 122415 bytes
 static/Images/manual/ECM_editing_interface.png     | Bin 22467 -> 130743 bytes
 static/Images/manual/ECM_management_interface.png  | Bin 17721 -> 82370 bytes
 static/Images/manual/administrator_view.png        | Bin 34121 -> 83958 bytes
 ...he_instance_name_to_view_engine_information.png | Bin 15085 -> 85894 bytes
 static/Images/manual/edit_directory.png            | Bin 37047 -> 106120 bytes
 static/Images/manual/global_history_interface.png  | Bin 33772 -> 90399 bytes
 .../Images/manual/global_history_query_button.png  | Bin 33347 -> 95553 bytes
 static/Images/manual/global_variable_interface.png | Bin 12185 -> 66700 bytes
 .../manual/microservice_management_interface.png   | Bin 14527 -> 91037 bytes
 static/Images/manual/new_application_type.png      | Bin 42139 -> 138753 bytes
 .../manual/parameter_configuration_interface.png   | Bin 32415 -> 100226 bytes
 static/Images/manual/queue_set.png                 | Bin 42827 -> 92028 bytes
 .../manual/resource_management_interface.png       | Bin 18044 -> 78592 bytes
 static/Images/manual/sparksql_run.png              | Bin 46611 -> 101594 bytes
 .../manual/task_execution_log_of_a_single_task.png | Bin 55931 -> 137298 bytes
 static/Images/manual/workflow.png                  | Bin 51259 -> 123120 bytes
 .../architecture/commons/message_scheduler.md      |   2 +-
 .../version-1.0.2/architecture/commons/rpc.md      |   2 +-
 .../engine/engine_conn_manager.md                  |   2 +-
 .../computation_governance_services/entrance.md    |   5 +-
 .../computation_governance_services/linkis-cli.md  |   2 +-
 .../linkis_manager/app_manager.md                  |   4 +-
 .../linkis_manager/overview.md                     |   7 +-
 .../linkis_manager/resource_manager.md             |  13 +-
 .../computation_governance_services/overview.md    |   4 +-
 .../sourcecode_hierarchical_structure.md           |  59 +++
 .../version-1.0.2/deployment/web_install.md        |   4 +-
 .../version-1.0.2/development/linkis_debug.md      | 249 ++++++----
 versioned_docs/version-1.0.2/engine_usage/hive.md  |  72 +--
 versioned_docs/version-1.0.2/engine_usage/jdbc.md  |  58 ++-
 .../version-1.0.2/engine_usage/python.md           |  55 ++-
 versioned_docs/version-1.0.2/engine_usage/shell.md |  53 ++-
 versioned_docs/version-1.0.2/engine_usage/spark.md |  65 +--
 versioned_docs/version-1.0.2/introduction.md       |   4 +-
 .../tuning_and_troubleshooting/overview.md         |   2 +-
 .../version-1.0.2/user_guide/how_to_use.md         |   6 +-
 .../version-1.0.2/user_guide/sdk_manual.md         | 500 +++++++++------------
 219 files changed, 2245 insertions(+), 2722 deletions(-)

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to