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

Jump to bottom

Node upgrade fixes #968

Merged
merged 4 commits into from Jan 11, 2017
Merged

Node upgrade fixes #968

merged 4 commits into from Jan 11, 2017

Conversation

jsuchome
Copy link
Member

No description provided.

rhafer
rhafer suggested changes Jan 10, 2017
View reviewed changes
Copy link
Contributor

@rhafer rhafer left a comment •
edited

Choose a reason for hiding this comment

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

It seems that this commit:
316272a

is already part of #950 so at least "cherry picked from commit 7b6001f" is somewhat misleading here. Do you have plans to remove that commit from the other PR?

@jsuchome
Copy link
Member Author

@rhafer yes, I've already removed it from #950

@jsuchome
upgrade: Use correct Node model
2788255 
NodeObject was renamed to Node, so we must call it via ::Node,
otherwise, api/node.rb would be used.
@jsuchome jsuchome mentioned this pull request Jan 10, 2017
Merged
@jsuchome jsuchome merged commit 35bfc2b into crowbar:master Jan 11, 2017
@jsuchome jsuchome deleted the node-upgrade-fixes branch January 11, 2017 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rhafer rhafer rhafer approved these changes

@nicolasbock nicolasbock nicolasbock approved these changes

Assignees

@rhafer rhafer

@skazi0 skazi0

@MaximilianMeister MaximilianMeister

Labels
upgrade
Milestone
No milestone
5 participants
@jsuchome @rhafer @nicolasbock @skazi0 @MaximilianMeister