From 505f14929176208f574630e76efb70ad7ddfa254 Mon Sep 17 00:00:00 2001
From: Kyle Banker <kylebanker@gmail.com>
Date: Wed, 15 Dec 2010 15:29:36 -0500
Subject: [PATCH] 1.1.5 history and credits.

---
 docs/CREDITS.md | 4 ++++
 docs/HISTORY.md | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/docs/CREDITS.md b/docs/CREDITS.md
index ac5dcd2..0d4dde5 100644
--- a/docs/CREDITS.md
+++ b/docs/CREDITS.md
@@ -117,3 +117,7 @@ Hongli Lai (Phusion)
 Mislav Marohnić
 
 * Replaced returning with each_with_object
+
+Alex Stupka
+
+* Replica set port bug
diff --git a/docs/HISTORY.md b/docs/HISTORY.md
index 0897520..a88a65a 100644
--- a/docs/HISTORY.md
+++ b/docs/HISTORY.md
@@ -1,5 +1,14 @@
 # MongoDB Ruby Driver History
 
+### 1.1.5
+2010-12-15
+
+* ReplSetConnection class. This must be used for replica set connections from
+  now on. You can still use Connection.multi, but that method has been deprecated.
+* Automated replica set tests. rake test:rs
+* Check that request and response ids match.
+* Several bug fixes. See the commit history for details.
+
 ### 1.1.4
 2010-11-30