From 45a39084eddd72879a1bdd176a943dbe538eefc5 Mon Sep 17 00:00:00 2001
From: Jaime Casanova <jaime@2ndQuadrant.com>
Date: Sat, 21 Jul 2012 11:56:00 -0500
Subject: [PATCH] Prepare release notes for release

---
 HISTORY | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/HISTORY b/HISTORY
index 490c01e4..9916e922 100644
--- a/HISTORY
+++ b/HISTORY
@@ -31,15 +31,18 @@
 1.1.0   2011-03-09
         Make options -U, -R and -p not mandatory (Jaime)
 
-1.1.1	2012-04-20
+1.1.1	2012-04-18
         Add --ignore-rsync-warning (Cédric)
         Add strnlen for compatibility with OS X (Greg)
         Improve performance of repl_status view (Jaime) 
+        Remove last argument from log_err (Jaime, Reported by Jeroen Dekkers)
+        Complete documentation about possible error conditions (Jaime)
+        Document how to clean history (Jaime)
 
-1.2.0	2012-06-15
+1.2.0	2012-07-27
 		Test ssh connection before trying to rsync (Cédric)
-        Add CLUSTER SHOW command (Carlo Ascani)
+        Add CLUSTER SHOW command (Carlo)
         Add CLUSTER CLEANUP command (Jaime)
-        Add function write_primary_conninfo (Marco Nenciarini)
+        Add function write_primary_conninfo (Marco)
         Teach repmgr how to get tablespace's location in different pg version (Jaime)
 		Improve version message (Carlo)