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

Fix FTP credentials for log depot #4682

Merged

Conversation

mzazrivec
Copy link
Contributor

@mzazrivec mzazrivec commented Sep 19, 2018

Configuration ➛ Diagnostics ➛ click on a server ➛ Collect Logs ➛ Edit ➛ Add / edit FTP depot

Without this fix, credentials (username & password) for the ftp depot wouldn't show.

https://bugzilla.redhat.com/show_bug.cgi?id=1627273

@miq-bot
Copy link
Member

miq-bot commented Sep 19, 2018

Checked commits mzazrivec/manageiq-ui-classic@18e2b46~...b574cc6 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
0 files checked, 0 offenses detected
Everything looks fine. 🏆

@mzazrivec mzazrivec force-pushed the fix_ftp_credentials_for_log_depot branch from b574cc6 to 3facf07 Compare October 8, 2018 14:03
@mzazrivec mzazrivec changed the title [WIP] Fix FTP credentials for log depot Fix FTP credentials for log depot Oct 8, 2018
@mzazrivec mzazrivec removed the wip label Oct 8, 2018
Copy link
Member

@romanblanco romanblanco left a comment

Choose a reason for hiding this comment

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

Tested, works in UI 👍

@martinpovolny martinpovolny merged commit 15915b2 into ManageIQ:master Oct 8, 2018
@martinpovolny martinpovolny added this to the Sprint 96 Ending Oct 8, 2018 milestone Oct 8, 2018
@martinpovolny martinpovolny self-assigned this Oct 8, 2018
@mzazrivec mzazrivec deleted the fix_ftp_credentials_for_log_depot branch October 8, 2018 17:17
simaishi pushed a commit that referenced this pull request Oct 8, 2018
@simaishi
Copy link
Contributor

simaishi commented Oct 8, 2018

Hammer backport details:

$ git log -1
commit 6c7804e65f69cdc07d367a41b518ba410d0807d2
Author: Martin Povolny <mpovolny@redhat.com>
Date:   Mon Oct 8 17:13:21 2018 +0200

    Merge pull request #4682 from mzazrivec/fix_ftp_credentials_for_log_depot
    
    Fix FTP credentials for log depot
    
    (cherry picked from commit 15915b21a63e9df1d86f014b38388451e8bb7f5e)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1627273

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants