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 2020/06/19 07:27:45 UTC

[incubator-dolphinscheduler] branch dev-merge updated (714ae33 -> 73cae7f)

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

leonbao pushed a change to branch dev-merge
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.


    from 714ae33  merge from dev
     add b939ab8  Delete the pom files animation.scss, _normalize.scss and _animation.scss under the common folder
     add 40269a5  Merge pull request #2972 from break60/dev-1.3.0
     add f26367f  Change email to default (#2981)
     add 1c47a15  add mybatis-3 notice in the top-level notice (#3003)
     add 25607f8  fix download resource file that under the directory error (#3007)
     add 08beae8  Fix unfiltered jar files in resource directory and UDF upload resource parameters (#3008)
     add 620ecff  fix singe resource manager will NPE (#3013)
     add 73cae7f  merge from dev-1.3.0

No new revisions were added by this update.

Summary of changes:
 NOTICE                                             |   70 +
 .../api/service/ResourcesService.java              |    2 +-
 .../dolphinscheduler/common/utils/HadoopUtils.java |   20 +-
 .../src/main/resources/common.properties           |    2 +-
 .../common/utils/HadoopUtilsTest.java              |    4 +-
 .../src/main/resources/config/install_config.conf  |    2 +-
 .../pages/udf/pages/function/_source/createUdf.vue |    5 +
 .../js/module/components/fileUpdate/udfUpdate.vue  |    6 +-
 dolphinscheduler-ui/src/lib/external/email.js      |    2 +-
 .../src/sass/common/_animation.scss                | 3658 --------------------
 dolphinscheduler-ui/src/sass/common/index.scss     |    1 -
 pom.xml                                            |    2 -
 12 files changed, 94 insertions(+), 3680 deletions(-)
 delete mode 100644 dolphinscheduler-ui/src/sass/common/_animation.scss