Github user GabrielBrascher commented on the pull request:

    https://github.com/apache/cloudstack/pull/1459#issuecomment-204484447
  
    @DaanHoogland thanks for the hint, but the problem is not related to line 
ending.
    
    The problem is that there are two (2) different SshHelper classes in the 
ACS history. Although the content is the same, they were moved.
    
    The master SshHelper 
(https://github.com/apache/cloudstack/commits/75b68c68298dab270782be68f8f9f28e551fc5d0/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java)
 is located at 
"cloudstack/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java". The file 
that I got to edit is the predecessor of the master SshHelper and is located at 
"cloudstack/utils/src/com/cloud/utils/ssh/SshHelper.java".
    
    I am not sure about how to proceed.
    
    On the one hand, by keeping this PR as it is, it will preserve the history 
of all commits of this (SshHelper) class 
(https://github.com/likitha/cloudstack/commits/CLOUDSTACK-8611/utils/src/com/cloud/utils/ssh/SshHelper.java)
 and the path will remain as the master; on the other hand, if I add these 
changes in the SshHelper at the current master, it will appear that I made all 
the changes in this class.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to