Merge branch 'feature/upstream' into develop

1 files changed, 13 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index dc4b5a0..b93d73e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4368,3 +4368,16 @@ wdt.8          iwdt.8       (ipmiutil wdt)
 			    Contributed by Hozefa Karachiwala
   buildwin.cmd            - detect/set MARCH=IA86 or X64 from vcvars
   buildmin.cmd            - detect/set MARCH=IA86 or X64 for minimal
+  Windows EXEs built with openssl 1.0.2
+
+03/12/2020 ARCress ipmiutil-3.1.6  changes (iver 3.16)
+  util/iconfig.c          - fix Fedora bug 1811462 [abrt] ipmiutil config -a
+  util/ipmiutil.c         - show version with usage in -h case
+  scripts/ipmiutil.env.template - renamed env as template
+			    (contributed by mwilliams<at>illuminate.solutions)
+  scripts/Makefile.am     - renamed env as template 
+  scripts/checksel	  - also rm -f $ddir/sel.idx after isel -d
+			    (contributed by eguzovsky<at>gmail.com)
+  doc/Makefile.am     	  - change gzip -f to gzip -nf for man pages
+			    (SR#40 patch from Jeremy Puhlman)
+