updates for patch that came in just under the wire

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/ChangeLog b/ChangeLog
index 190999b..ea3b0e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+commit 8843aecde3f6312b7b6ef3e03efe4d9202972821
+Author: Ben Shum <ben@evergreener.net>
+Date:   Tue Mar 14 23:00:56 2017 -0400
+
+    LP#1672926: Disable/remove default nginx config in REAMDE steps
+    
+    Since we will be adding our own custom nginx config, disable/remove the
+    default one that is installed so there's no confusion later on.
+    
+    Signed-off-by: Ben Shum <ben@evergreener.net>
+    Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
+
+2      1       README
+
+commit f9818694ccc95d7b305e6173d01cf7ba73f99968
+Author: Galen Charlton <gmc@equinoxinitiative.org>
+Date:   Tue Mar 21 09:28:54 2017 -0400
+
+    update ChangeLog for 2.5.0
+    
+    Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
+
+1215   0       ChangeLog
+
 commit dab92ad2da878490c12ba94d1614a5059400617a
 Author: Galen Charlton <gmc@equinoxinitiative.org>
 Date:   Tue Mar 21 09:28:35 2017 -0400

diff --git a/doc/RELEASE_NOTES.txt b/doc/RELEASE_NOTES.txt
index ac5fe17..3c0d304 100644 (file)
--- a/doc/RELEASE_NOTES.txt
+++ b/doc/RELEASE_NOTES.txt
@@ -122,7 +122,7 @@ Other changes
   * Add support for Ubuntu Xenial (LP#1551090)
   * Fix a bug with syslog configuration (LP#1473479)
   * Fix OpenSRF debian_sys_config order for Debian (LP#1585041)
-  * Improvements to the installation documentation (LP#1382038 and LP#1670045)
+  * Improvements to the installation documentation (LP#1382038, LP#1670045, and LP#1672926)
   * Improve normalization of memcache keys to avoid potential
     denial of service and privilege escalation attacks. (LP#1652382)
   * Fix an infinite recursion bug in opensrf.system.method.all. (LP#1652122)