Don't truncate IPV6 addresses in cf-key -s output
Don't truncate IPv6 addresses in cf-key -s output (part2)
Merge remote branch 'upstream/master'
Don't hardcode lock-runlog file rotation, let it to logrotate() bundle
Merge pull request #799 from JarleB/master

Don't truncate IPV6 addresses in cf-key -s output
Refs #3395: adding support for openvz
Merge pull request #956 from ncharles/openvz_support_master

Refs #3395: adding support for openvz
Merge pull request #968 from jimis/master

Various small fixes/cleanups
Add convenience this.promise_dirname variable, with acceptance test.
Reformulating code to avoid nasty surprises

GCC emits a warning when a pointer of a certain type is reinterpreted
as something else and assigned. The potential issue is that GCC might
reorder the way the pointer is read/written because it might assume the
wrong type, therefore it is better to avoid such things.
Merge pull request #970 from cduclos/tls-generic-warning

Reformulating code to avoid nasty surprises
Merge pull request #969 from tzz/feature/promise_dirname

Add convenience this.promise_dirname variable, with acceptance test.
Adding Version structure

This structure can be used to compare software versions. It is aimed
towards comparison of CFEngine versions.
It supports the following format:

major.minor.path.extra-build

The field 'extra' is never included in comparisons, it is only included for
compatibility with Windows systems.
Merge pull request #971 from cduclos/cf-agent-update

Adding Version structure
Fix overzealous writing of cf_promises_validated
Redmine#3446: ignore source position when unique-hashing promises
Merge pull request #889 from lpefferkorn/runlog_rotation

Don't hardcode lock-runlog file rotation, let it to CFEngine policies
strftime_GMT.cf: filter out GMT_Hr0 through GMT_Hr9 from the test
Merge pull request #973 from tzz/tzz/strftime-test-fix

strftime_GMT.cf: filter out GMT_Hr0 through GMT_Hr9 from the test
Fix process user counting by realigning enum PlatformContext