[incubator-dolphinscheduler] branch json_split updated (95bbdfe -> a7d396f)

[le...@apache.org]

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

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


    from 95bbdfe  Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into json-split
     add 6429e8c  [Improvement][UI] Correct spelling mistakes (#4440)
     new a7d396f  Merge remote-tracking branch 'upstream/dev' into json-split

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 dolphinscheduler-ui/src/js/conf/home/App.vue       |  2 +-
 .../src/js/conf/home/router/index.js               | 64 +++++++++++-----------
 2 files changed, 33 insertions(+), 33 deletions(-)

[incubator-dolphinscheduler] 01/01: Merge remote-tracking branch 'upstream/dev' into json-split

[le...@apache.org]

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 a7d396fccc7e9bb48d8f18a2b77d76da0e404b52
Merge: 95bbdfe 6429e8c
Author: lenboo <ba...@gmail.com>
AuthorDate: Thu Jan 14 11:38:53 2021 +0800

    Merge remote-tracking branch 'upstream/dev' into json-split

 dolphinscheduler-ui/src/js/conf/home/App.vue       |  2 +-
 .../src/js/conf/home/router/index.js               | 64 +++++++++++-----------
 2 files changed, 33 insertions(+), 33 deletions(-)