From e2af28a6e361ccd5bfea40171dfb84f2d0ac2291 Mon Sep 17 00:00:00 2001
From: Eric Evans <eevans@apache.org>
Date: Tue, 1 Sep 2009 22:25:00 +0000
Subject: [PATCH] merged from cassandra-0.4 branch

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810282 13f79535-47bb-0310-9956-ffa450edef68
---
 NOTICE.txt                                          |   7 +++++++
 lib/{flexjson.jar => flexjson-1.7.jar}              | Bin
 .../apache/cassandra/service/CassandraServer.java   |   2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)
 rename lib/{flexjson.jar => flexjson-1.7.jar} (100%)

diff --git a/NOTICE.txt b/NOTICE.txt
index 81f986289d..1770f2d48b 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -5,3 +5,10 @@ This product includes software developed by The Apache Software
 Foundation (http://www.apache.org/).
 
 Developers and Contributors are listed in the project POM file
+
+JSON support is provided by Flexjson (http://flexjson.sf.net).
+Copyright 2007 Charlie Hubbard.
+
+This product makes use of the google-collections library from
+http://code.google.com/p/google-collections/.
+Copyright (C) 2008 Google Inc.
diff --git a/lib/flexjson.jar b/lib/flexjson-1.7.jar
similarity index 100%
rename from lib/flexjson.jar
rename to lib/flexjson-1.7.jar
diff --git a/src/java/org/apache/cassandra/service/CassandraServer.java b/src/java/org/apache/cassandra/service/CassandraServer.java
index 5326e352ca..ecee92f78b 100644
--- a/src/java/org/apache/cassandra/service/CassandraServer.java
+++ b/src/java/org/apache/cassandra/service/CassandraServer.java
@@ -509,7 +509,7 @@ public class CassandraServer implements Cassandra.Iface
         }
         else if (propertyName.equals("version"))
         {
-            return "0.3.0";
+            return "0.4.0";
         }
         else
         {