cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject [1/2] git commit: merge from 1.1.0
Date Mon, 27 Feb 2012 22:23:56 GMT
Updated Branches:
  refs/heads/cassandra-1.1 8f81f3d0a -> 25565b6bb


merge from 1.1.0


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

Branch: refs/heads/cassandra-1.1
Commit: 25565b6bb8f320b847410a8a16fa08139d0fe33e
Parents: 8f81f3d 930721d
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Tue Feb 28 01:21:55 2012 +0300
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Tue Feb 28 01:21:55 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 interface/cassandra.thrift                         |   28 +-
 .../org/apache/cassandra/thrift/CfDef.java         | 1030 ++++++++++++++-
 .../org/apache/cassandra/thrift/Constants.java     |    2 +-
 .../org/apache/cassandra/thrift/KsDef.java         |  106 ++-
 5 files changed, 1161 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25565b6b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 990e6ef,41316eb..502cf4c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -15,9 -11,9 +15,10 @@@
   * Remove deprecated merge_shard_chance (CASSANDRA-3940)
   * add a convenient way to reset a node's schema (CASSANDRA-2963)
   * fix for intermittent SchemaDisagreementException (CASSANDRA-3884)
 + * CLI `list <CF>` to limit number of columns and their order (CASSANDRA-3012)
   * ignore deprecated KsDef/CfDef/ColumnDef fields in native schema (CASSANDRA-3963)
   * CLI to report when unsupported column_metadata pair was given (CASSANDRA-3959)
+  * reincarnate removed and deprecated KsDef/CfDef attributes (CASSANDRA-3953)
  Merged from 1.0:
   * remove the wait on hint future during write (CASSANDRA-3870)
   * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)


Mime
View raw message