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 #7833: Upgrade to CFEngine 3.7.3 #940

Merged

Conversation

amousset
Copy link
Member

@amousset
Copy link
Member Author

Commit modified

@amousset amousset force-pushed the ust_7833/upgrade_to_cfengine_3_7_3 branch from df431a9 to 7c91201 Compare May 18, 2016 14:55
@amousset
Copy link
Member Author

We are almost even with upstream! We still have to keep the patch for the runlog file (it has only been integrated upsteam in 3.8).

Added the patches for:

  • default bodies
  • callstack function

I also integrated the tests for these patches, which was not always for previous Rudder releases. We should be able to run as many CFEngine tests as possible against our agent.

@ncharles
Copy link
Member

This is awesome !
Just a question: shouldn't we backport the callstack function in 3.2 as well ?

@amousset amousset force-pushed the ust_7833/upgrade_to_cfengine_3_7_3 branch from 7c91201 to 7d9686e Compare May 25, 2016 09:12
@amousset
Copy link
Member Author

PR rebased

@amousset amousset force-pushed the ust_7833/upgrade_to_cfengine_3_7_3 branch from 7d9686e to 693275e Compare May 25, 2016 09:14
@amousset
Copy link
Member Author

Commit modified

@peckpeck
Copy link
Member

The callstack triggers a significant amount of code in ncf 1.0, I don't think we should enable it in a minor release

@jooooooon
Copy link
Member

peckpeck wrote:

The callstack triggers a significant amount of code in ncf 1.0, I don't think we should enable it in a minor release

This is targeted to master, so that won't happen.

@peckpeck
Copy link
Member

@jooooooon yes, I was just replying to @ncharles who wanted to target it to 3.2

@jooooooon
Copy link
Member

Oh yes, sorry @peckpeck, somehow I missed the entire conversation. That's ok then.

@jooooooon jooooooon merged commit db0a9d3 into Normation:master May 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants