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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

No package under FreeBSD #1227

Merged
merged 1 commit into from
Sep 16, 2019
Merged

Conversation

jas01
Copy link

@jas01 jas01 commented Aug 27, 2019

With FreeBSD bzip2 as part of the system, so it's not need to install
bzip2 package, and because this package doesn't exist the class go in
error if it try to install that package.

I put the change inside the mysqldump.pp I'm pretty sure that's not the correct way to do it (should be inside params.pp) but well I think it's the only os who have this difference, and...soon we going to use some hiera.yaml instead of this params.pp 馃槈

@sheenaajay
Copy link
Contributor

@jas01 Thanks for submitting the PR. Could you please rebase the master, since it contains changes for acceptance test setup. Thank you.

@jas01
Copy link
Author

jas01 commented Sep 6, 2019 via email

@sheenaajay
Copy link
Contributor

@jas01 Looks like rebase pulled down all commit from master to this branch.
Do you want to open a PR with the changes? Please let us know if you need any help or information. Thank you.

@jas01
Copy link
Author

jas01 commented Sep 11, 2019 via email

@sheenaajay
Copy link
Contributor

@jas01 depends on the setup the commands can change. Basically we use git rebase command to do rebase (git rebase puppetlabs/master (if puppetlabs is the upstream )) and push the changes to your branch.
If rebase is done if will have all changes to your master branch but not all the commits or changes from the master will be added to the PR.

Since its pulled all changes including the commits on the master to this PR it will throw an error during the merge.

You can try to do rebase again and see if the PR shows only your changes and commit,If it's not successful it better to open a new PR with your changes

@sheenaajay
Copy link
Contributor

@jas01 Please let us know if the rebase command works. Happy to help you.

  With FreeBSD bzip2 as part of the system, so it's not need to install
  bzip2 package, and because this package doesn't exist the class go in
  error if it try to install that package.
@jas01
Copy link
Author

jas01 commented Sep 13, 2019 via email

@sheenaajay
Copy link
Contributor

@jas01 can see 19 commits on this branch. Could you please do clean rebase and force push like you done with your other PR. Thank you.

@jas01
Copy link
Author

jas01 commented Sep 16, 2019 via email

@sheenaajay
Copy link
Contributor

Screen Shot 2019-09-16 at 16 15 24

@sheenaajay sheenaajay merged commit dc5d57e into puppetlabs:master Sep 16, 2019
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.

None yet

2 participants