From 6a002680ba13747fe00a5dc6ec9d7a80ae51e76e Mon Sep 17 00:00:00 2001
From: btoddb <btoddb@gmail.com>
Date: Wed, 8 Feb 2012 09:35:02 -0800
Subject: [PATCH] adding changes regarding Composite Serializable

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 771dddf95..1982af858 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,11 @@ Changes by version:
 Versions above 0.7.0-17 work well with cassandra's 0.7.* (after 0.7.0-beta2)
 See object-mapper/CHANGELOG for HOM specifics
 
+1.0-4
+=====
+Made Composite Serializable
+Added Composite to TypeInferringSerializer
+
 1.0-3
 =====
 Additional utility methods on ComparatorType. Thanks to ash2k for the patch.