this was also added.... fold into 1 userland change

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1528058 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 4b41aeae4df9ddd9095d3872fdae92312b8274ae..8d6a7e3ed97ae428b134bcf464b1d02cfbee4823 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,7 +13,8 @@ Changes with Apache 2.4.7
      realm has not been specified. [Graham Leggett]
 
   *) mod_proxy: Add a note in the balancer manager stating whether changes
-     will or will not be persisted. [Daniel Ruggeri]
+     will or will not be persisted and whether settings are inherited.
+     [Daniel Ruggeri, Jim Jagielski]
 
   *) mod_cache: Avoid a crash with strcmp() when the hostname is not provided.
      [Graham Leggett]