From 903d3fb1cf704d809829913d42e142c7fb3b2ec9 Mon Sep 17 00:00:00 2001
From: Charlie Savage <cfis@zerista.com>
Date: Thu, 24 Mar 2011 00:21:01 -0600
Subject: [PATCH] Update to version 3.1.5

---
 History.txt                           | 4 +++-
 lib/composite_primary_keys/version.rb | 2 +-
 website/index.html                    | 2 +-
 website/version-raw.js                | 2 +-
 website/version.js                    | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/History.txt b/History.txt
index ccef266c..f9632bac 100644
--- a/History.txt
+++ b/History.txt
@@ -1,6 +1,8 @@
-== 3.1.5 2011-??-??
+== 3.1.5 2011-03-24
 * Fix simple calculation methods
 * Fix instantiation of cpk records via associations.
+* Fix Relation#delete_all
+* Fix Relation#destroy
 
 == 3.1.4 2011-03-06
 * Support ActiveRecord 3.0.5 (interpolate_sql was removed and
diff --git a/lib/composite_primary_keys/version.rb b/lib/composite_primary_keys/version.rb
index b750ee66..1693c808 100644
--- a/lib/composite_primary_keys/version.rb
+++ b/lib/composite_primary_keys/version.rb
@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end
diff --git a/website/index.html b/website/index.html
index fe0c109e..6568675e 100644
--- a/website/index.html
+++ b/website/index.html
@@ -33,7 +33,7 @@
     <h1>Composite Primary Keys</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubygems.org/gems/composite_primary_keys"; return false'>
       Get Version
-      <a href="http://rubygems.org/gems/composite_primary_keys" class="numbers">3.1.4</a>
+      <a href="http://rubygems.org/gems/composite_primary_keys" class="numbers">3.1.5</a>
     </div>
     <h1>&#8594; Ruby on Rails</h1>
 <h1>&#8594; ActiveRecords</h1>
diff --git a/website/version-raw.js b/website/version-raw.js
index 31446d33..ea8540c0 100644
--- a/website/version-raw.js
+++ b/website/version-raw.js
@@ -1,3 +1,3 @@
 // Announcement JS file
-var version = 3.1.4;
+var version = 3.1.5;
 MagicAnnouncement.show('compositekeys', version);
diff --git a/website/version.js b/website/version.js
index 87230630..78cad9dd 100644
--- a/website/version.js
+++ b/website/version.js
@@ -1,4 +1,4 @@
 // Version JS file
-var version = 3.1.4;
+var version = 3.1.5;
 
 document.write(" - " + version);