From 2acbc72f76c47d037be833c7f3529427d0b5ef3e Mon Sep 17 00:00:00 2001
From: Jeremie Dimino <jdimino@janestreet.com>
Date: Mon, 5 Mar 2018 16:35:59 +0000
Subject: [PATCH] Update changelog

---
 CHANGES.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 71721662..7fac809e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,12 @@ next
 - Accept and ignore `ppx.driver` fields in library stanzas, in
   preparation for the generic ppx driver system (#588)
 
+- Change the default behavior regarding the check for overlaps between
+  local and installed libraries. Now even if there is no link time
+  conflict, we don't allow an external dependency to overlap with a
+  local library, unless the user specifies `allow_overlapping_dependencies`
+  in the jbuild file (#587, fixes #562)
+
 1.0+beta18 (25/02/2018)
 -----------------------