You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/03/08 02:53:29 UTC
[incubator-dolphinscheduler] 01/02: Merge remote-tracking branch
'upstream/dev' into spilit
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch json_split
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit bb7106d100c341be14fb94b0e5f63a294470deb7
Merge: ce6338b 71bd231
Author: lenboo <ba...@gmail.com>
AuthorDate: Mon Mar 8 10:23:16 2021 +0800
Merge remote-tracking branch 'upstream/dev' into spilit
.../dolphinscheduler/common/utils/HadoopUtils.java | 12 +-
.../common/utils/KerberosHttpClient.java | 169 ++++++++---------
.../home/pages/dag/_source/formModel/formModel.vue | 124 ++++++-------
.../formModel/tasks/_source/dependItemList.vue | 1 +
.../dag/_source/formModel/tasks/conditions.vue | 4 +-
.../pages/dag/_source/formModel/tasks/datax.vue | 18 +-
.../dag/_source/formModel/tasks/dependent.vue | 10 +-
.../pages/dag/_source/formModel/tasks/flink.vue | 1 -
.../pages/dag/_source/formModel/tasks/http.vue | 19 +-
.../home/pages/dag/_source/formModel/tasks/mr.vue | 2 +-
.../dag/_source/formModel/tasks/pre_tasks.vue | 49 +++--
.../pages/dag/_source/formModel/tasks/python.vue | 3 +-
.../home/pages/dag/_source/formModel/tasks/sql.vue | 4 +-
.../pages/dag/_source/formModel/tasks/sqoop.vue | 200 ++++++++++-----------
.../dag/_source/formModel/tasks/sub_process.vue | 44 +++--
.../dag/_source/formModel/tasks/waterdrop.vue | 2 +-
dolphinscheduler-ui/src/sass/common/index.scss | 8 +-
17 files changed, 312 insertions(+), 358 deletions(-)