From 3c5d82b9ef4e42d5dbb8a3edf804f02023302e76 Mon Sep 17 00:00:00 2001
From: Jaime Casanova <jaime@2ndQuadrant.com>
Date: Fri, 27 Apr 2012 02:07:42 -0500
Subject: [PATCH] Complete CREDITS and HISTORY for release

---
 CREDITS | 1 +
 HISTORY | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index 78e707b8..99bb0e5a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -10,3 +10,4 @@ Hannu Krosing <hannu@2ndQuadrant.com>
 Cédric Villemain <cedric@2ndquadrant.com>
 Charles Duffy <charles@dyfis.net>
 Daniel Farina <daniel@heroku.com>
+Marco Nenciarini <marco.nenciarini@2ndquadrant.it>
diff --git a/HISTORY b/HISTORY
index 8a5e8471..4d8a75eb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -31,7 +31,12 @@
 1.1.0   2011-03-09
         Make options -U, -R and -p not mandatory (Jaime)
 
-1.1.1	2011-XX-XX
+1.1.1	2012-04-20
         Add --ignore-rsync-warning (Cédric)
         Add strnlen for compatibility with OS X (Greg)
         Improve performance of repl_status view (Jaime) 
+
+1.2.0	2012-04-28
+        Add CLUSTER SHOW command (Marco Nenciarini)
+        Add CLUSTER CLEANUP command (Jaime)
+        Add function write_primary_conninfo (Marco Nenciarini)