search

sous-chefs / haproxy

Development repository for the haproxy cookbook
https://supermarket.chef.io/cookbooks/haproxy
Apache License 2.0
158 stars 250 forks source link

Update haproxy_install.md #462

Closed derekgroh closed 3 years ago

derekgroh commented 3 years ago

Description

Updates documentation to match changes made #457

Issues Resolved

None

Contribution Check List

N/A documentation

the-label-bot[bot] commented 3 years ago

Kind Prediction: feature Confidence: 0.985

Provide the bot with feedback using a :thumbsup: or :thumbsdown:!

the-label-bot[bot] commented 3 years ago

Size Prediction: small Confidence: 0.999

Nice! This should be quick to review

Provide the bot with feedback using a :thumbsup: or :thumbsdown:!

bmhughes commented 3 years ago

Thanks for the PR @derekgroh! If you sort out the trailing space mdl error we can get this merged, also could you do me a favour and drop the nils I missed from the allowed values as well please as they don't really make sense to be there.

the-label-bot[bot] commented 3 years ago

Size Prediction: small Confidence: 0.999

Nice! This should be quick to review

Provide the bot with feedback using a :thumbsup: or :thumbsdown:!

derekgroh commented 3 years ago

@bmhughes Believe I got all the nils you wanted.

bmhughes commented 3 years ago

@bmhughes Believe I got all the nils you wanted.

Yes that looks ideal, thanks for that. Just stick and entry in the changelog under unreleased and we should be good to go.

derekgroh commented 3 years ago

Really? Thought documentation wasn't included in the changelog, did that change or am I thinking another project?

bmhughes commented 3 years ago

Doc changes have always been in there as far as I know so got to be something else.

bmhughes commented 3 years ago

Rather than a merge you need to drop the merge commit and rebase your branch on master. Assuming your forked repos master is up to date with this repos master (which it appears to be).

git reset --hard HEAD^ && git rebase master