[OpenSRF-GIT] OpenSRF branch rel_2_5 updated. osrf_rel_2_5_0-rc-7-g6793a4d

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, rel_2_5 has been updated
       via  6793a4d7022714899c6701914284581784dadb1d (commit)
      from  8843aecde3f6312b7b6ef3e03efe4d9202972821 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6793a4d7022714899c6701914284581784dadb1d
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Tue Mar 21 09:38:23 2017 -0400

    updates for patch that came in just under the wire
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/ChangeLog b/ChangeLog
index 190999b..ea3b0e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+commit 8843aecde3f6312b7b6ef3e03efe4d9202972821
+Author: Ben Shum <ben at 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 at evergreener.net>
+    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+2	1	README
+
+commit f9818694ccc95d7b305e6173d01cf7ba73f99968
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date:   Tue Mar 21 09:28:54 2017 -0400
+
+    update ChangeLog for 2.5.0
+    
+    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+1215	0	ChangeLog
+
 commit dab92ad2da878490c12ba94d1614a5059400617a
 Author: Galen Charlton <gmc at 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
--- 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)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |   24 ++++++++++++++++++++++++
 doc/RELEASE_NOTES.txt |    2 +-
 2 files changed, 25 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
OpenSRF