You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ga...@apache.org on 2020/09/21 07:43:59 UTC

[incubator-dolphinscheduler] branch alert_plugin_design updated (5ee12d9 -> 94ef848)

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

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


    omit 5ee12d9  fix
    omit 715f1f3  fix
    omit 95a5572  Modify node version
    omit d96a063  Add form-create plug-in and alarm group management add sample demo
    omit 63a0ba5  [feature-3665][ui]Add element-ui (#3666)
     add 3942740  js mailbox verification fix. (#3721)
     add 93bc5c0  fix:Dockerfile user apk --no-cache (#3691)
     add 092ce2a  The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
     add fbd35dd  Merge branch 'dev' into dev-bug-ui-definition-batchDelete
     add da829ae  Merge pull request #3708 from zhuangchong/dev-bug-ui-definition-batchDelete
     add 9bf52f9  definition and instance bulk action buttons show changes.
     add ec350fb  Merge pull request #3694 from zhuangchong/dev-imp-ui-definition-ButtonsShow
     add a34f829  [Improvement][ui] Refactored dag formatting logic (#3703)
     add 36d5349  [fix-3745][server] server get tasktype NPE exception (#3746)
     add 2f584f6  [Fix][ui]fix the letter case mistake (#3760)
     add 42deff0  [test-2559][e2e] test data configure isolation  (#3712)
     add 8de96ac  [feature-3665][ui]Add element-ui (#3666)
     add efec7f3  Add form-create plug-in and alarm group management add sample demo
     add 99abbf7  Modify node version
     add 2e486ca  fix
     add 94ef848  fix

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (5ee12d9)
            \
             N -- N -- N   refs/heads/alert_plugin_design (94ef848)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 docker/build/Dockerfile                            |  31 +--
 .../common/utils/TaskParametersUtils.java          |  71 +++----
 dolphinscheduler-dist/release-docs/LICENSE         |   1 +
 .../ui-licenses/{LICENSE-axios => LICENSE-dagre}   |   2 +-
 .../server/worker/task/TaskManager.java            |  10 +-
 .../server/worker/task/TaskManagerTest.java        |  19 +-
 dolphinscheduler-ui/package.json                   |   1 +
 .../src/js/conf/home/pages/dag/_source/dag.js      | 212 +++------------------
 .../pages/definition/pages/list/_source/list.vue   |  19 +-
 .../pages/definition/pages/list/_source/util.js    |   2 +-
 .../pages/instance/pages/list/_source/list.vue     |  11 +-
 .../pages/user/pages/password/_source/info.vue     |   2 +-
 e2e/pom.xml                                        |  10 +
 .../apache/dolphinscheduler/util/YmlReader.java    |  37 ++--
 .../apache/dolphinscheduler/base/BaseDriver.java   |   1 -
 .../apache/dolphinscheduler/data/LoginData.java    |   3 -
 .../data/project/ProcessInstanceData.java          |  12 +-
 .../dolphinscheduler/data/project/ProjectData.java |  16 +-
 .../data/project/RunWorkflowData.java              |  19 +-
 .../dolphinscheduler/data/project/TimingData.java  |  25 +--
 .../data/project/WorkflowDefineData.java           |  76 +-------
 .../data/security/AlertManageData.java             |  18 +-
 .../data/security/QueueManageData.java             |  31 +--
 .../data/security/TenantManageData.java            |  30 +--
 .../data/security/TokenManageData.java             |  15 +-
 .../data/security/UserManageData.java              |  29 +--
 .../locator/project/WorkflowDefineLocator.java     |   2 +
 .../locator/security/TokenManageLocator.java       |   6 +-
 .../locator/security/UserManageLocator.java        |   2 +
 .../apache/dolphinscheduler/page/LoginPage.java    |   8 +-
 .../page/project/ProcessInstancePage.java          |   4 +-
 .../dolphinscheduler/page/project/ProjectPage.java |  15 +-
 .../page/project/RunWorkflowPage.java              |  11 +-
 .../dolphinscheduler/page/project/TimingPage.java  |  31 +--
 .../page/project/WorkflowDefinePage.java           |  57 +++---
 .../page/security/AlertManagePage.java             |  14 +-
 .../page/security/QueueManagePage.java             |  18 +-
 .../page/security/TenantManagePage.java            |  16 +-
 .../page/security/TokenManagePage.java             |  14 +-
 .../page/security/UserManagePage.java              |  33 ++--
 e2e/src/test/resources/testData/security_zh_cn.yml |  55 ++++++
 e2e/src/test/resources/testData/workflow_zh_cn.yml |  63 ++++++
 e2e/testng.xml                                     |   2 +-
 43 files changed, 467 insertions(+), 587 deletions(-)
 copy dolphinscheduler-dist/release-docs/licenses/ui-licenses/{LICENSE-axios => LICENSE-dagre} (95%)
 copy dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/shell/ShellExecutorTest.java => e2e/src/main/java/org/apache/dolphinscheduler/util/YmlReader.java (54%)
 create mode 100644 e2e/src/test/resources/testData/security_zh_cn.yml
 create mode 100644 e2e/src/test/resources/testData/workflow_zh_cn.yml