Adding a missed word.

Adding a word that was missing.
contrib/cfengine.el: add 25.1 compatibility code and clean up
Merge pull request #2015 from tzz/tzz/cfengine.el

contrib/cfengine.el: add 25.1 compatibility code and clean up
contrib/cfengine.el: Support add-log-current-defun-function
Add: Acceptance test for depends_on

Test that depends_on will restrict activation of a promise until all
dependant promises identified by promise handle are ok (either kept or
repaired).
Add: Acceptance test for module protocol

Should be able to use negative class expressions with classes defined
from module protocol right away.

ref: https://dev.cfengine.com/issues/6689
Merge pull request #2017 from nickanderson/redmine/6689

Add: Acceptance test for module protocol
Merge pull request #2019 from leoliu/master

contrib/cfengine.el: Support add-log-current-defun-function
Add: Acceptance test for file_select attributes

When attributes come from variables set directly in policy  file_select
with mtime behaves one way, and when those variables are populated from
an external data file file_select with mtime behaves differently.
Redmine #6590: Add leaner version of Solaris MAC address detection.

Also made sure that Solaris does not select the getifaddrs version,
since although the function is available, it cannot actually be used
to get the MAC address.

And removed a suppressed failure for Windows which is not correct
anymore.
Redmine #6590: Revert "add implementation of getifaddrs for solaris"

This reverts commit debbe3e770dd1ff8e2211ba2c2d3e5d2cbc36739.

Conflicts:

	libpromises/Makefile.am
	libpromises/solaris_ifaddrs.c
	libpromises/solaris_ifaddrs.h
	libpromises/unix.c
Add negative bounds checks for string_head and string_tail
Fail when read_file is called with a negative size
Merge pull request #2022 from worr/bugs/bounds-checks

Bounds checks for read_file, string_head and string_tail
Merge pull request #2014 from kacfengine/solaris_mac_address

Redmine #6590: Add leaner version of Solaris MAC address detection.
Merge pull request #2020 from nickanderson/redmine/5462

Add: Acceptance test for depends_on
Tolerate when Redmine ticket is specified with '#' in front.
Merge pull request #2021 from nickanderson/redmine/6584

Add: Acceptance test for file_select attributes
Add: Acceptance tests for warn only and mustache templating

Modified by: Kristian Amlie <kristian.amlie@cfengine.com>
Redmine#6725: refactor the local class matching functions and add tag support to them