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

Update to tomcat.py #12889

Merged
merged 2 commits into from
May 23, 2014
Merged

Update to tomcat.py #12889

merged 2 commits into from
May 23, 2014

Conversation

perdurabo93
Copy link
Contributor

-Added "force" (default false) option commensurate with force option in salt.modules.tomcat.deploy_war to allow forced deployment of a .war even if the version strings match.
-Forced successful deploy comment to be a string instead of dict to compensate for #12840

-Added "force" (default false) option commensurate with force option in salt.modules.tomcat.deploy_war to allow forced deployment of a .war even if the version strings match.  
-Forced successful deploy comment to be a string instead of dict to compensate for saltstack#12840
@ghost
Copy link

ghost commented May 19, 2014

Test Failed.

If the failures are unrelated to your code, don't stress, a core developer will know these apart.
In the future, if possible, please branch off a passing commit to avoid false positives.
Refer to this link for build results: http://jenkins.saltstack.com/job/salt-pr-build/4473/

@@ -53,6 +53,7 @@ def __virtual__():
# Functions
def war_deployed(name,
war,
force,
Copy link
Contributor

Choose a reason for hiding this comment

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

force should be set to False by-default to be compatible with previous sls files

@ghost
Copy link

ghost commented May 19, 2014

Test Failed.

If the failures are unrelated to your code, don't stress, a core developer will know these apart.
In the future, if possible, please branch off a passing commit to avoid false positives.
Refer to this link for build results: http://jenkins.saltstack.com/job/salt-pr-build/4481/

thatch45 added a commit that referenced this pull request May 23, 2014
@thatch45 thatch45 merged commit cd58182 into saltstack:develop May 23, 2014
@thatch45
Copy link
Contributor

Thanks for the catch @ranl, I will clean this up :)

@perdurabo93
Copy link
Contributor Author

Thanks, Thomas.

thatch45 added a commit that referenced this pull request May 23, 2014
@ranl
Copy link
Contributor

ranl commented May 25, 2014

👍 @perdurabo93 @thatch45

@perdurabo93
Copy link
Contributor Author

It looks like these changes didn't make it into 2014.1.5

@basepi
Copy link
Contributor

basepi commented Jun 19, 2014

That's true. If you want to make sure something makes it into the next release, please ping me (@basepi) on the thread and ask me to cherry-pick it. I've labeled this so it will go into 2014.1.6.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants