1. 30 4月, 2020 4 次提交
  2. 29 4月, 2020 3 次提交
    • D
      Merge branch 'dev' into dev · 682fd7be
      dailidong 提交于
      682fd7be
    • X
      modify dataX environment variable (#2577) · 22d4ee94
      xingchun-chen 提交于
      * add LoginTest license
      
      * Delete useless packages
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * Update worker_group_id to worker_group in init.sql
      
      * Update worker_group_id to worker_group in init.sql
      
      * Update worker_group_id to worker_group
      
      * Increase dataX environment variable, sslTrust default value
      
      * modify dataX environment variable
      Co-authored-by: weixin_41213428's avatarchenxingchun <438044805@qq.com>
      22d4ee94
    • Q
      No master don't create command #2571 (#2575) · 5666e6b7
      qiaozhanwei 提交于
      * dispatch task fail will set task status failed
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * #2486 bug fix
      
      * host and workergroup compatible
      
      * EnterpriseWeChatUtils modify
      
      * EnterpriseWeChatUtils modify
      
      * EnterpriseWeChatUtils modify
      
      * #2499 bug fix
      
      * add comment
      
      * revert comment
      
      * revert comment
      
      * #2499 buf fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * No master don't create command #2571
      
      * No master don't create command #2571
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      5666e6b7
  3. 28 4月, 2020 9 次提交
    • D
      Merge branch 'dev' into dev · 5caa6e5d
      dailidong 提交于
      5caa6e5d
    • Q
      no valid worker group,master can kill task directly (#2541) · a12103b0
      qiaozhanwei 提交于
      * dispatch task fail will set task status failed
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * #2486 bug fix
      
      * host and workergroup compatible
      
      * EnterpriseWeChatUtils modify
      
      * EnterpriseWeChatUtils modify
      
      * EnterpriseWeChatUtils modify
      
      * #2499 bug fix
      
      * add comment
      
      * revert comment
      
      * revert comment
      
      * #2499 buf fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      
      * no valid worker group,master can kill task directly
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      a12103b0
    • X
      Increase dataX environment variable, sslTrust default value (#2555) · 7a100086
      xingchun-chen 提交于
      * add LoginTest license
      
      * Delete useless packages
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * Update worker_group_id to worker_group in init.sql
      
      * Update worker_group_id to worker_group in init.sql
      
      * Update worker_group_id to worker_group
      
      * Increase dataX environment variable, sslTrust default value
      Co-authored-by: weixin_41213428's avatarchenxingchun <438044805@qq.com>
      7a100086
    • M
    • M
      336a7f34
    • M
      fix bug "Password display in plain text" · 9421a794
      mzjnumber1@163.com 提交于
      9421a794
    • L
      verify whether the filename start with '/' (#2544) · fd79be39
      lgcareer 提交于
      * fix #2442 when the resource name contains '$',need translate it to '\$'
      
      * fix #2442 when the resource name contains '$',need translate it to '/$'
      
      * verify whether the filename start with '/'
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      fd79be39
    • X
      Merge pull request #2549 from break60/dev · 062a0ffb
      xingchun-chen 提交于
      Fix page display incomplete
      062a0ffb
    • B
      Fix page display incomplete · 76b61c15
      break60 提交于
      76b61c15
  4. 27 4月, 2020 3 次提交
  5. 26 4月, 2020 7 次提交
    • L
      Merge pull request #2522 from liwenhe1993/docker-compose-dev · e13c08d0
      liwenhe1993 提交于
      Running the docker cluster of dolphinscheduler by docker-compse
      e13c08d0
    • Q
      Merge branch 'dev' into docker-compose-dev · f38e076d
      qiaozhanwei 提交于
      f38e076d
    • Z
      update version 2.0.0 backup to 1.3.0 (#2531) · 1185cdaf
      zhangchunyang 提交于
      * Ambari plugin development for the dolphin scheduler in version 2.0.0 is complete
      
      * Update the Ambari plugin of DS  usage documentation
      
      * delete readme whic is not completed
      
      * update version 2.0.0 backup to 1.3.0
      
      * update ambari plugin version to 1.3.0
      Co-authored-by: Nzhangchunyang <zhangchunyang@analysys.com.cn>
      Co-authored-by: Nzhangchunyang <18910529250@163.com>
      1185cdaf
    • Q
      Merge branch 'dev' into docker-compose-dev · 7aab8016
      qiaozhanwei 提交于
      7aab8016
    • Q
      #2499 bug fix (#2527) · 9f32f2db
      qiaozhanwei 提交于
      * dispatch task fail will set task status failed
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * #2486 bug fix
      
      * host and workergroup compatible
      
      * EnterpriseWeChatUtils modify
      
      * EnterpriseWeChatUtils modify
      
      * EnterpriseWeChatUtils modify
      
      * #2499 bug fix
      
      * add comment
      
      * revert comment
      
      * revert comment
      
      * #2499 buf fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      
      * #2499 bug fix
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      9f32f2db
    • L
      Modify docker-compose and kubernetes config · 7eecfe45
      liwenhe1993 提交于
      1. Move kubernetes to docker directory
      2. Change docker-compose directory's name, and move docker-compose to docker directory
      3. Modify docker-compose config and kubernetes config
      4. Modify startup.sh in dockerfile
      7eecfe45
    • L
      Add docker-compose.yml · f1d8c151
      liwenhe1993 提交于
      f1d8c151
  6. 24 4月, 2020 14 次提交