Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.1.x+master] Clarify meaning of DeploymentStates when displayed #1169

Closed
wants to merge 1 commit into from

Conversation

ericbottard
Copy link
Contributor

@ericbottard ericbottard commented Feb 13, 2017

Fixes #1153

Please also merge on master

@@ -80,6 +80,11 @@
<version>${spring-cloud-deployer.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
Copy link
Member

Choose a reason for hiding this comment

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

Any dependencies we need to add in this pom to me indicates that we have an upstream issue, either in spring-cloud-starter-dataflow-server-local or in spring-cloud-deployer-local.

@trisberg
Copy link
Member

Removed the dependency added for spring-cloud-deployer-local, correct version should already be pulled in after this PR is merged: #1172

Merged as commit 97bfd2e

@trisberg trisberg closed this Feb 13, 2017
@trisberg trisberg removed the in pr label Feb 13, 2017
@trisberg trisberg reopened this Feb 13, 2017
@trisberg trisberg added the in pr label Feb 13, 2017
@trisberg
Copy link
Member

trisberg commented Feb 13, 2017

Not able to cherry-pick this commit to master branch, seems there are some other changes made in the RuntimeAppsController that conflict with these changes. The tests fail after I apply the cherry-picked commit.

@trisberg
Copy link
Member

Added comment on issue #1153

@trisberg trisberg closed this Feb 13, 2017
@trisberg trisberg removed the in pr label Feb 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/1.2.x Issue for a branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants