Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 43218 invoked from network); 1 Sep 2009 22:25:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Sep 2009 22:25:25 -0000 Received: (qmail 53122 invoked by uid 500); 1 Sep 2009 22:25:25 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 53086 invoked by uid 500); 1 Sep 2009 22:25:25 -0000 Mailing-List: contact cassandra-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cassandra-dev@incubator.apache.org Delivered-To: mailing list cassandra-commits@incubator.apache.org Received: (qmail 53075 invoked by uid 99); 1 Sep 2009 22:25:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Sep 2009 22:25:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Sep 2009 22:25:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B972723888DB; Tue, 1 Sep 2009 22:25:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r810282 - in /incubator/cassandra/trunk: ./ interface/gen-java/org/apache/cassandra/service/ lib/ src/java/org/ src/java/org/apache/cassandra/service/ test/unit/org/ Date: Tue, 01 Sep 2009 22:25:01 -0000 To: cassandra-commits@incubator.apache.org From: eevans@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090901222501.B972723888DB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: eevans Date: Tue Sep 1 22:25:00 2009 New Revision: 810282 URL: http://svn.apache.org/viewvc?rev=810282&view=rev Log: merged from cassandra-0.4 branch Added: incubator/cassandra/trunk/lib/flexjson-1.7.jar - copied unchanged from r810277, incubator/cassandra/branches/cassandra-0.4/lib/flexjson-1.7.jar Removed: incubator/cassandra/trunk/lib/flexjson.jar Modified: incubator/cassandra/trunk/ (props changed) incubator/cassandra/trunk/NOTICE.txt incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java (props changed) incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java (props changed) incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java (props changed) incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java (props changed) incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java (props changed) incubator/cassandra/trunk/src/java/org/ (props changed) incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java incubator/cassandra/trunk/test/unit/org/ (props changed) Propchange: incubator/cassandra/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 1 22:25:00 2009 @@ -1 +1,2 @@ /incubator/cassandra/branches/cassandra-0.3:774578-796573 +/incubator/cassandra/branches/cassandra-0.4:810145-810281 Modified: incubator/cassandra/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/NOTICE.txt?rev=810282&r1=810281&r2=810282&view=diff ============================================================================== --- incubator/cassandra/trunk/NOTICE.txt (original) +++ incubator/cassandra/trunk/NOTICE.txt Tue Sep 1 22:25:00 2009 @@ -5,3 +5,10 @@ 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. Propchange: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 1 22:25:00 2009 @@ -1,2 +1,3 @@ /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573 +/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java:810145-810281 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java:749219-768588 Propchange: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 1 22:25:00 2009 @@ -1,2 +1,4 @@ /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198 +/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Column.java:810145-810281 +/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java:749219-794428 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/column_t.java:749219-768588 Propchange: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 1 22:25:00 2009 @@ -1,2 +1,3 @@ /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573 +/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:810145-810281 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:749219-768588 Propchange: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 1 22:25:00 2009 @@ -1,2 +1,3 @@ /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573 +/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:810145-810281 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:749219-768588 Propchange: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 1 22:25:00 2009 @@ -1,2 +1,4 @@ /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198 +/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:810145-810281 +/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:749219-794428 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:749219-768588 Propchange: incubator/cassandra/trunk/src/java/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 1 22:25:00 2009 @@ -1,2 +1,3 @@ /incubator/cassandra/branches/cassandra-0.3/src/java/org:774578-796573 +/incubator/cassandra/branches/cassandra-0.4/src/java/org:810145-810281 /incubator/cassandra/trunk/src/java/org:749219-769885 Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java?rev=810282&r1=810281&r2=810282&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java Tue Sep 1 22:25:00 2009 @@ -509,7 +509,7 @@ } else if (propertyName.equals("version")) { - return "0.3.0"; + return "0.4.0"; } else { Propchange: incubator/cassandra/trunk/test/unit/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 1 22:25:00 2009 @@ -1,2 +1,3 @@ /incubator/cassandra/branches/cassandra-0.3/test/unit/org:774578-796573 +/incubator/cassandra/branches/cassandra-0.4/test/unit/org:810145-810281 /incubator/cassandra/trunk/test/unit/org:749219-768583