Skip to content

merge from 1.3.1-release#3161

Merged
qiaozhanwei merged 16 commits intodevfrom
dev-131
Jul 13, 2020
Merged

merge from 1.3.1-release#3161
qiaozhanwei merged 16 commits intodevfrom
dev-131

Conversation

@lenboo
Copy link
Copy Markdown
Contributor

@lenboo lenboo commented Jul 7, 2020

Tips

What is the purpose of the pull request

merge from 1.3.1-release

Brief change log

(for example:)

  • Add maven-checkstyle-plugin to root pom.xml

Verify this pull request

(Please pick either of the following options)

This pull request is code cleanup without any test coverage.

(or)

This pull request is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

(example:)

  • Added dolphinscheduler-dao tests for end-to-end.
  • Added CronUtilsTest to verify the change.
  • Manually verified the change by testing locally.

davidzollo and others added 16 commits July 7, 2020 14:36
@davidzollo
merge from 1.3.1-release
e9d2648
@zhangchunyang1024
[bugfix] remove Conflicting configuration sudo and user (#3038)
222538e 
Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>
@lgcareer
remove some standard notices in order to cut down the NOTICE file. (#…
7e69f97 
…3101)

* #3084 remove some standard notices in order to cut down the NOTICE file.

* update exclude element sql/soft_version of rat plugin

* update soft_version
@lgcareer
merge from 1.3.1-release
25f8d05
@lgcareer
fix 3112:download udf resource need find the tenant code of resource …
d212a63 
…owner (#3114)

* fix 3112:download udf resource need find the tenant code of resource owner

* fix 2975:download resource need find the tenant code of resource owner

* remove useless code
@lgcareer
merge from 1.3.1-release
5293a4f
@lenboo
remove some notes (#3127)
3347285 
Co-authored-by: lenboo <baoliang@analysys.com.cn>
@davidzollo
fix Permission denied if not found dolphinscheder-env.sh on 1.3.1 (#3128
f689f2a 
)

* fix Permission denied if not found dolphinscheder-env.sh

* update some comments on method
@lgcareer
add PropertyPlaceholderHelper on license (#3129)
0ed7942 
* update license header location

* add PropertyPlaceholderHelper on license
@lenboo
merge from 1.3.1-release
7959827
change from 1.3.0 to 1.3.2
43be448
add Set import
7e7dfe6
@davidzollo
Merge branch 'dev' into dev-131
a34dea0
@davidzollo
Merge branch 'dev' into dev-131
2d6055f
@davidzollo
Merge branch 'dev' into dev-131
b5d380b
@davidzollo
Merge branch 'dev' into dev-131
afd51a7
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Jul 10, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 7 Code Smells

16.1% 16.1% Coverage
0.0% 0.0% Duplication

qiaozhanwei
qiaozhanwei approved these changes Jul 13, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@qiaozhanwei qiaozhanwei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@qiaozhanwei qiaozhanwei merged commit 657ea47 into dev Jul 13, 2020
@lenboo lenboo deleted the dev-131 branch July 29, 2020 10:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@qiaozhanwei qiaozhanwei qiaozhanwei approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@lenboo @qiaozhanwei @davidzollo @zhangchunyang1024 @lgcareer