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

(FM-7483) - update module to the latest version #310

Merged
merged 6 commits into from
Oct 17, 2018

Conversation

lionce
Copy link
Contributor

@lionce lionce commented Oct 16, 2018

  • by mistake i checked out upstream/master to commit id: 8a46c6d - (MODULES-1821) - Support empty sections

  • i created new branch with the latest version of the module
    d6b1142 - this was the last merge

@lionce lionce requested review from DavidS and pmcmaw October 16, 2018 12:50
Copy link
Contributor

@pmcmaw pmcmaw left a comment

Choose a reason for hiding this comment

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

Blocking merge until this is discussed.

@lionce lionce merged commit d6b1142 into puppetlabs:master Oct 17, 2018
@lionce
Copy link
Contributor Author

lionce commented Oct 17, 2018

i've updated upstream/master using git reset --hard d6b1142
now upstream/master has all the latest commits. This PR is no longer valid

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

Successfully merging this pull request may close these issues.

3 participants