Skip to content

remove dir format in assembly#1304

Merged
qiaozhanwei merged 226 commits intoapache:1.2.0-releasefrom
lgcareer:1.2.0-release
Nov 21, 2019
Merged

remove dir format in assembly#1304
qiaozhanwei merged 226 commits intoapache:1.2.0-releasefrom
lgcareer:1.2.0-release

Conversation

@lgcareer
Copy link
Copy Markdown
Contributor

remove dir format in assembly

…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
add license in ci
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
change version to 1.2.0-SNAPSHOT
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
change verison 1.2.1-SNAPSHOT
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
set defalut db type postgresql
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
set defalut db type postgresql
@qiaozhanwei qiaozhanwei merged commit 0f52d08 into apache:1.2.0-release Nov 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants