From 5683b905dd59c9b3356617305997d76879c53e13 Mon Sep 17 00:00:00 2001
From: Jaime Casanova <jaime@2ndQuadrant.com>
Date: Sat, 21 Jul 2012 12:22:04 -0500
Subject: [PATCH] New development branch is 2.1dev

---
 HISTORY   | 9 ++++++---
 version.h | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/HISTORY b/HISTORY
index 6acdcddc..0f783a1d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -31,12 +31,15 @@
 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-18
         Add --ignore-rsync-warning (Cédric)
         Add strnlen for compatibility with OS X (Greg)
         Improve performance of the 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)
         Add CLUSTER CLEANUP command (Jaime)
@@ -44,7 +47,7 @@
         Teach repmgr how to get tablespace's location in different pg version (Jaime)
 		Improve version message (Carlo)
 
-2.0.0   2012-XX-XX
+2.0beta 2012-07-27
         Make CLONE command try to make an exact copy including $PGDATA location (Cedric) 
 		Add detection of master failure (Jaime)
 		Add the notion of a witness server (Jaime)
diff --git a/version.h b/version.h
index f5fbf579..97c2c265 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
-#define REPMGR_VERSION "1.2.0"
+#define REPMGR_VERSION "2.1dev"
 #endif