Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

fixed the merge conflict on merging #1941#1977

Closed
karuturi wants to merge 1 commit intomasterapache/cloudstack:masterfrom
unknown repositoryCopy head branch name to clipboard
Closed

fixed the merge conflict on merging #1941#1977
karuturi wants to merge 1 commit intomasterapache/cloudstack:masterfrom
unknown repositoryCopy head branch name to clipboard

Conversation

@karuturi
Copy link
Member

No description provided.

@anshul1886
Copy link

LGTM. This change occurs due to code around that are gets diverged in master and 4.9 with merge of PR #1727.

@karuturi
Copy link
Member Author

Thanks for the review anshul.

@karuturi
Copy link
Member Author

PR #1975 has the same fix. closing this in favour of #1975 as jenkins already passed there.

@karuturi karuturi closed this Feb 28, 2017
@karuturi karuturi deleted the build-fix branch April 14, 2017 04:25
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.

2 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.