-
Notifications
You must be signed in to change notification settings - Fork 357
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
Displayed Physical Server Hardware info #1272
Displayed Physical Server Hardware info #1272
Conversation
This pull request is not mergeable. Please rebase and repush. |
2dc7266
to
1e866b0
Compare
@MaysaMacedo Please add a screenshot in the first PR comment. @dclarizio @martinpovolny Tested in UI and can be merged. |
@MaysaMacedo @AparnaKarve this travis failure DOES look related:
|
@dclarizio You are right. I just saw the first error which affected a lot of PRs yesterday. @MaysaMacedo Let me know if you need help resolving the spec failure. |
@MaysaMacedo To resolve the spec error, please add the following in the computer_system = FactoryGirl.create(:computer_system, :hardware => FactoryGirl.create(:hardware))
physical_server = FactoryGirl.create(:physical_server, :computer_system => computer_system) |
@MaysaMacedo While merging the 'master' commit sometimes addresses the merge conflict error (referring to f447558), the recommended approach to resolve the merge conflict would be to rebase your current branch with master. |
58c4d34
to
bb29fe4
Compare
@AparnaKarve When rebasing with master 47 commits are created and bigger conflicts are generated |
@MaysaMacedo Let's discuss how to rebase in gitter. |
bb29fe4
to
2ac2836
Compare
Checked commits MaysaMacedo/manageiq-ui-classic@f052252~...2ac2836 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0 |
@MaysaMacedo LGTM @dclarizio OK to merge |
This PR is able to:
-Display Physical Server hardware information (total memory and total cores)