From 58e09b902418d07545caec675d67265f1d510f4b Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 6 Aug 2015 21:08:08 -0400
Subject: [PATCH] 9.5 release notes:  mention ON CONFLICT DO NOTHING for FDWs

Report by Peter Geoghegan

Backpatch through 9.5
---
 doc/src/sgml/release-9.5.sgml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/src/sgml/release-9.5.sgml b/doc/src/sgml/release-9.5.sgml
index b1a3b2dbec..6aeefd24a7 100644
--- a/doc/src/sgml/release-9.5.sgml
+++ b/doc/src/sgml/release-9.5.sgml
@@ -2447,6 +2447,24 @@ FIXME: Improve description, link
 
       <listitem>
 <!--
+2015-05-08 [168d580] Andres..: Add support for INSERT ... ON CONFLICT DO NOTHI..
+2015-05-08 [2c8f483] Andres..: Represent columns requiring insert and update p..
+-->
+       <para>
+        Foreign tables can now take part in <command>INSERT ... ON CONFLICT
+        DO NOTHING</> queries (Peter Geoghegan, Heikki Linnakangas,
+        Andres Freund)
+       </para>
+
+       <para>
+        Foreign data wrappers must be modified to handle this.
+        <command>INSERT ... ON CONFLICT DO UPDATE</> is not supported on
+        foreign tables.
+       </para>
+      </listitem>
+
+      <listitem>
+<!--
 2014-12-18 [4a14f13] Tom Lane: Improve hash_create's API for selecting simple-..
 -->
        <para>
-- 
2.40.0