cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eev...@apache.org
Subject svn commit: r916431 - in /incubator/cassandra/trunk: ./ debian/ interface/thrift/gen-java/org/apache/cassandra/thrift/
Date Thu, 25 Feb 2010 20:01:51 GMT
Author: eevans
Date: Thu Feb 25 20:01:50 2010
New Revision: 916431

URL: http://svn.apache.org/viewvc?rev=916431&view=rev
Log:
merge w/ 0.6 branch

Modified:
    incubator/cassandra/trunk/   (props changed)
    incubator/cassandra/trunk/build.xml
    incubator/cassandra/trunk/debian/cassandra.install
    incubator/cassandra/trunk/debian/init
    incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
  (props changed)
    incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
  (props changed)
    incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
  (props changed)
    incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
  (props changed)
    incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
  (props changed)

Propchange: incubator/cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 20:01:50 2010
@@ -1,4 +1,4 @@
 /incubator/cassandra/branches/cassandra-0.3:774578-796573
 /incubator/cassandra/branches/cassandra-0.4:810145-834239,834349-834350
 /incubator/cassandra/branches/cassandra-0.5:888872-915439
-/incubator/cassandra/branches/cassandra-0.6:911237-916311
+/incubator/cassandra/branches/cassandra-0.6:911237-916430

Modified: incubator/cassandra/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/build.xml?rev=916431&r1=916430&r2=916431&view=diff
==============================================================================
--- incubator/cassandra/trunk/build.xml (original)
+++ incubator/cassandra/trunk/build.xml Thu Feb 25 20:01:50 2010
@@ -42,7 +42,7 @@
     <property name="test.name" value="*Test"/>
     <property name="test.unit.src" value="${test.dir}/unit"/>
     <property name="dist.dir" value="${build.dir}/dist"/>
-    <property name="version" value="0.6.0-beta1"/>
+    <property name="version" value="0.6.0-beta2"/>
     <property name="final.name" value="${ant.project.name}-${version}"/>
     <property name="ivy.version" value="2.1.0" />
     <property name="ivy.url"

Modified: incubator/cassandra/trunk/debian/cassandra.install
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/debian/cassandra.install?rev=916431&r1=916430&r2=916431&view=diff
==============================================================================
--- incubator/cassandra/trunk/debian/cassandra.install (original)
+++ incubator/cassandra/trunk/debian/cassandra.install Thu Feb 25 20:01:50 2010
@@ -3,17 +3,26 @@
 debian/cassandra.in.sh usr/share/cassandra
 bin/cassandra usr/sbin
 bin/cassandra-cli usr/bin
-bin/nodeprobe usr/bin
+bin/nodetool usr/bin
+bin/clustertool usr/bin
 lib/antlr-3.1.3.jar usr/share/cassandra
+lib/avro-1.2.0-dev.jar usr/share/cassandra
 lib/clhm-production.jar usr/share/cassandra
-lib/commons-cli-1.1.jar usr/share/cassandra
-lib/commons-collections-3.2.1.jar usr/share/cassandra
-lib/commons-lang-2.4.jar usr/share/cassandra
-lib/google-collect-1.0-rc1.jar usr/share/cassandra
 lib/high-scale-lib.jar usr/share/cassandra
-lib/jline-0.9.94.jar usr/share/cassandra
-lib/json_simple-1.1.jar usr/share/cassandra
 lib/libthrift-r894924.jar usr/share/cassandra
-lib/log4j-1.2.15.jar usr/share/cassandra
-lib/slf4j-api-1.5.8.jar usr/share/cassandra
-lib/slf4j-log4j12-1.5.8.jar usr/share/cassandra
+build/lib/jars/commons-cli-1.1.jar usr/share/cassandra
+build/lib/jars/commons-codec-1.2.jar usr/share/cassandra
+build/lib/jars/commons-collections-3.2.1.jar usr/share/cassandra
+build/lib/jars/commons-httpclient-3.1.jar usr/share/cassandra
+build/lib/jars/commons-lang-2.4.jar usr/share/cassandra
+build/lib/jars/commons-logging-1.1.1.jar usr/share/cassandra
+build/lib/jars/google-collections-1.0.jar usr/share/cassandra
+build/lib/jars/hadoop-core-0.20.1.jar usr/share/cassandra
+build/lib/jars/jackson-core-asl-1.4.0.jar usr/share/cassandra
+build/lib/jars/jackson-mapper-asl-1.4.0.jar usr/share/cassandra
+build/lib/jars/jline-0.9.94.jar usr/share/cassandra
+build/lib/jars/json-simple-1.1.jar usr/share/cassandra
+build/lib/jars/junit-4.6.jar usr/share/cassandra
+build/lib/jars/log4j-1.2.14.jar usr/share/cassandra
+build/lib/jars/slf4j-api-1.5.8.jar usr/share/cassandra
+build/lib/jars/slf4j-log4j12-1.5.8.jar usr/share/cassandra

Modified: incubator/cassandra/trunk/debian/init
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/debian/init?rev=916431&r1=916430&r2=916431&view=diff
==============================================================================
--- incubator/cassandra/trunk/debian/init (original)
+++ incubator/cassandra/trunk/debian/init Thu Feb 25 20:01:50 2010
@@ -87,7 +87,7 @@
         -Dcom.sun.management.jmxremote.port=8080 \
         -Dcom.sun.management.jmxremote.ssl=false \
         -Dcom.sun.management.jmxremote.authenticate=false \
-        org.apache.cassandra.service.CassandraDaemon
+        org.apache.cassandra.thrift.CassandraDaemon
 
     if ! is_running; then return 2; fi
 }
@@ -104,7 +104,7 @@
 	#   other if a failure occurred
     is_running || return 1
     $JSVC -stop -home $JAVA_HOME -pidfile $PIDFILE \
-            org.apache.cassandra.service.CassandraJsvcDaemon
+            org.apache.cassandra.thrift.CassandraDaemon
     is_running && return 2 || return 0
 }
 

Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 20:01:50 2010
@@ -1,6 +1,6 @@
 /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-834239,834349-834350
 /incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/Cassandra.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:911237-916311
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:911237-916430
 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java:749219-768588
 /incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:749219-904544

Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 20:01:50 2010
@@ -1,7 +1,7 @@
 /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-834239,834349-834350
 /incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/Column.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:911237-916311
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:911237-916430
 /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
 /incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:749219-904544

Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 20:01:50 2010
@@ -1,6 +1,6 @@
 /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-834239,834349-834350
 /incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:911237-916311
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:911237-916430
 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:749219-768588
 /incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:749219-904544

Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 20:01:50 2010
@@ -1,5 +1,5 @@
 /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-834239,834349-834350
 /incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:911237-916311
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:911237-916430
 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:749219-768588

Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 20:01:50 2010
@@ -1,7 +1,7 @@
 /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-834239,834349-834350
 /incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:911237-916311
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:911237-916430
 /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
 /incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:749219-904544



Mime
View raw message