From 7f796e2d156d50e569b382997f82de25a208a35d Mon Sep 17 00:00:00 2001
From: Jaime Casanova <jaime@2ndQuadrant.com>
Date: Thu, 19 Dec 2013 01:40:00 -0500
Subject: [PATCH] Update history and credit files

---
 CREDITS | 3 +++
 HISTORY | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index 753e80fde..6f556936e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -11,3 +11,6 @@ Cédric Villemain <cedric@2ndquadrant.com>
 Charles Duffy <charles@dyfis.net>
 Daniel Farina <daniel@heroku.com>
 Shawn Ellis <shawn.ellis17@gmail.com>
+Jay Taylor <jay@jaytaylor.com>
+Christian Kruse <christian@2ndQuadrant.com>
+Krzysztof Gajdemski <songo@debian.org.pl>
diff --git a/HISTORY b/HISTORY
index bfd36a170..68f84d1e6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,4 +1,11 @@
-2.0beta 2012-07-27
+2.0beta2 2013-12-19
+        Improve autofailover logic and algorithms (Jaime, Andres)
+        Ignore pg_log when cloning (Jaime)
+        Add timestamps to log line in stderr (Christian)
+        Correctly check wal_keep_segments (Jay Taylor)
+        Add a ssh_options parameter (Jay Taylor)
+
+2.0beta1 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)