Thu, 21 Sep 2017 15:42:55 +0200Fix shell escaping ENGINE-261
Damiano Boppart <damiano@pep-security.net> [Thu, 21 Sep 2017 15:42:55 +0200] rev 2085
Fix shell escaping

Thu, 21 Sep 2017 15:40:02 +0200Merge 2 heads. Print correct warning on what overrides are used ENGINE-261
Damiano Boppart <damiano@pep-security.net> [Thu, 21 Sep 2017 15:40:02 +0200] rev 2084
Merge 2 heads. Print correct warning on what overrides are used

Thu, 21 Sep 2017 15:29:14 +0200Add BUILD_CONF as the new PLATFORM_OVERRIDE ENGINE-261
Damiano Boppart <damiano@pep-security.net> [Thu, 21 Sep 2017 15:29:14 +0200] rev 2083
Add BUILD_CONF as the new PLATFORM_OVERRIDE

Wed, 20 Sep 2017 18:20:45 +0200Make Makefile ready for local.conf, add deprecation warning to doc ENGINE-261
Damiano Boppart <damiano@pep-security.net> [Wed, 20 Sep 2017 18:20:45 +0200] rev 2082
Make Makefile ready for local.conf, add deprecation warning to doc

Wed, 20 Sep 2017 17:53:25 +0200Move all build configuration into Makefile.conf ENGINE-261
Damiano Boppart <damiano@pep-security.net> [Wed, 20 Sep 2017 17:53:25 +0200] rev 2081
Move all build configuration into Makefile.conf

Wed, 20 Sep 2017 11:57:26 +0200Splice contents of build-config/* into one file ENGINE-261
Damiano Boppart <damiano@pep-security.net> [Wed, 20 Sep 2017 11:57:26 +0200] rev 2080
Splice contents of build-config/* into one file

Tue, 19 Sep 2017 15:59:55 +0200merged in default ENGINE-214
Krista Bennett <krista@pep-project.org> [Tue, 19 Sep 2017 15:59:55 +0200] rev 2079
merged in default

Tue, 19 Sep 2017 15:59:42 +0200ENGINE-214: actually works, but will need to be changed due to need to encapsulate message version in protected part of message. Infrastructure to do that comes in with this commit, but we need to refactor _decrypt_message in order to do everything cleanly. Branching for ENGINE-262 and will return to this branch once done with refactor. ENGINE-214
Krista Bennett <krista@pep-project.org> [Tue, 19 Sep 2017 15:59:42 +0200] rev 2078
ENGINE-214: actually works, but will need to be changed due to need to encapsulate message version in protected part of message. Infrastructure to do that comes in with this commit, but we need to refactor _decrypt_message in order to do everything cleanly. Branching for ENGINE-262 and will return to this branch once done with refactor.

Tue, 19 Sep 2017 12:38:55 +0200merged in default ENGINE-214
Krista Bennett <krista@pep-project.org> [Tue, 19 Sep 2017 12:38:55 +0200] rev 2077
merged in default

Tue, 19 Sep 2017 15:02:12 +0200Merge ENGINE-259
Damiano Boppart <damiano@pep-security.net> [Tue, 19 Sep 2017 15:02:12 +0200] rev 2076
Merge ENGINE-259