Fixes #3649 : You can now update your promises less than every 5 minutes
Merge pull request #169 from VinceMacBuche/bug_3849/not_updated_promises

Fixes #3649 : You can now update your promises less than every 5 minutes
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Fixes #3858 - Add possibility to set SUID and SGID for Download a file from a shared folder
Fixes #3870 - Fix hardcoded report which could not certainly not work with several Directives used
Merge pull request #176 from nperron/bug_3870/dev/fix_sudo_reports_with_several_rules

Fixes #3870 - Fix hardcoded report which could not certainly not work with several Directives used
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	techniques/systemSettings/userManagement/sudoParameters/1.0/sudoParameters.st
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Fixes #3603 - Add reload of rsyslog after logrotate of reports and LDAP log and add specific logrotate file for RHEL/CentOS
Merge pull request #175 from nperron/bug_3603/int/logrotate_let_empty_files

Fixes #3603 - Add reload of rsyslog after logrotate of reports and LDAP log and add specific logrotate file for RHEL/CentOS
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	techniques/system/distributePolicy/1.0/logrotate.debian.st
	techniques/system/distributePolicy/1.0/logrotate.suse.st
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Refs #3858 - Reindent and add more informations
Fixing #3884 : removing the backgrounding of local copy of inventory
Merge pull request #177 from ncharles/bug_3884/dev/remove_bg_on_local_copy

Fixing #3884 : removing the backgrounding of local copy of inventory
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Merge pull request #174 from nperron/ust_3115/dev/3858_add_suid_sgid_to_downloaded_files_bis

Fixes #3858 - Add possibility to set SUID and SGID for Download a file from a shared folder
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Fixes #3531,#3899: Backport the GIT lock nuking promise from 2.5