Dev 1.1.2 #1102
Merged
Dev 1.1.2 #1102
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 69a37ae. # Conflicts: # conf/dss-framework-orchestrator-server.properties # dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefCopyOperation.java # dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefCreationOperation.java
# Conflicts: # conf/dss-framework-orchestrator-server.properties # dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefCopyOperation.java # dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefCreationOperation.java # dss-apps/dss-apps-server/pom.xml # dss-apps/pom.xml # dss-commons/dss-bmlservice/pom.xml
This reverts commit 749edad.
This reverts commit 962c301.
This reverts commit 7a15324.
This reverts commit 248a411.
This reverts commit ee01a47.
This reverts commit 7a08440.
This reverts commit 23aca18.
This reverts commit 2fcd605.
This reverts commit 69617d6.
This reverts commit e31f3ae.
This reverts commit 41467ef
Fix some bugs.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge 1.1.2 to master.