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

Fixes #10425: Add migration script for hooks ignore suffixes #1294

Conversation

fanf
Copy link
Member

@fanf fanf commented Mar 15, 2017

@fanf
Copy link
Member Author

fanf commented Mar 15, 2017

PR rebased

@fanf fanf force-pushed the ust_10425/add_migration_script_for_hooks_ignore_suffixes branch from 5747ae5 to 519a437 Compare March 15, 2017 16:00
# before running a hook under /opt/rudder/etc/hooks.d.
# If an executable file has one of the following extensions, it
# will be IGNORED and the corresponding hook skipped. Non executable files are
# always ignored, with or without any of these extensions.
Copy link
Member

Choose a reason for hiding this comment

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

Can we please consistently use "suffixes" instead of "extensions"? Or if you think it should be "extension", then rename the property, but don't mix and match.

"


>>>>>>> Stashed changes
Copy link
Member

Choose a reason for hiding this comment

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

This looks like a git merge issue

@fanf
Copy link
Member Author

fanf commented Mar 15, 2017

PR rebased

@fanf fanf force-pushed the ust_10425/add_migration_script_for_hooks_ignore_suffixes branch from 519a437 to 6e81d9b Compare March 15, 2017 16:12
@fanf
Copy link
Member Author

fanf commented Mar 15, 2017

PR rebased

@fanf fanf force-pushed the ust_10425/add_migration_script_for_hooks_ignore_suffixes branch from 6e81d9b to 5a8761d Compare March 15, 2017 16:22
@@ -1,4 +1,4 @@
#!/bin/bash
rudder.hooks.ignore-suffixes#!/bin/bash
Copy link
Member

Choose a reason for hiding this comment

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

oops :)

@fanf
Copy link
Member Author

fanf commented Mar 15, 2017

PR rebased

@fanf fanf force-pushed the ust_10425/add_migration_script_for_hooks_ignore_suffixes branch from 5a8761d to d314239 Compare March 15, 2017 16:38
@Normation-Quality-Assistant
Copy link
Contributor

OK, merging this PR

@Normation-Quality-Assistant Normation-Quality-Assistant merged commit d314239 into Normation:branches/rudder/4.1 Mar 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants