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

[CDAP-6672]: fix documentation issues for SSHAction #353

Merged
merged 1 commit into from
Aug 15, 2016

Conversation

thegreenfrog
Copy link
Contributor

Fix docs issues outlined in https://issues.cask.co/browse/CDAP-6672

@knazir
Copy link
Contributor

knazir commented Aug 1, 2016

This will get overwritten by #348 since some of the properties have changed as well as their descriptions.

@knazir
Copy link
Contributor

knazir commented Aug 1, 2016

@thegreenfrog #348 was merged, you may need to make changes to resolve merge conflicts with the updated descriptions.

@@ -29,9 +29,13 @@ pull the private key from the secure key management store in CDAP such as ${secu
**command:** The command to be executed on the remote host. This includes the filepath of the script and any arguments
needing to be passed.

<<<<<<< d31ba0836377205c7cbdd3ce449313d0cadf0429
Copy link
Contributor

Choose a reason for hiding this comment

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

this is a merge conflict that needs addressing

@awholegunch
Copy link
Contributor

LGTM: Please check my last command make sure it's ok.

@thegreenfrog thegreenfrog merged commit 19b9b9a into release/1.4 Aug 15, 2016
@wolf31o2 wolf31o2 deleted the fix-SSHActionDoc-CDAP-6672 branch August 17, 2016 17:57
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.

4 participants