cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [8/50] git commit: merge from 1.1
Date Fri, 24 Feb 2012 15:49:22 GMT
merge from 1.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f370417
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f370417
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f370417

Branch: refs/heads/cassandra-1.1
Commit: 7f3704172d919971f38528d872ef011f378c5137
Parents: d359d8f e376bc0
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Wed Feb 22 22:05:20 2012 +0300
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Wed Feb 22 22:05:20 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 interface/cassandra.thrift                         |    1 -
 .../org/apache/cassandra/thrift/Cassandra.java     |    6 +-
 .../org/apache/cassandra/thrift/CfDef.java         |   96 +----------
 .../org/apache/cassandra/config/CFMetaData.java    |   23 +---
 src/java/org/apache/cassandra/config/Schema.java   |   18 ++
 .../cassandra/cql/CreateColumnFamilyStatement.java |    1 -
 .../statements/CreateColumnFamilyStatement.java    |    1 -
 src/java/org/apache/cassandra/db/Table.java        |   25 +++-
 .../apache/cassandra/service/MigrationManager.java |  144 +++++++++++----
 .../apache/cassandra/service/StorageService.java   |    7 +-
 .../cassandra/service/StorageServiceMBean.java     |    4 +-
 src/java/org/apache/cassandra/tools/NodeCmd.java   |    3 +
 src/java/org/apache/cassandra/tools/NodeProbe.java |    6 +-
 test/unit/org/apache/cassandra/SchemaLoader.java   |    6 +-
 test/unit/org/apache/cassandra/db/DefsTest.java    |    4 +-
 16 files changed, 172 insertions(+), 175 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f370417/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f370417/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f370417/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f370417/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f370417/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------


Mime
View raw message