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 21:46:25 GMT
Updated Branches:
  refs/heads/cassandra-1.1 39b501561 -> 8f81f3d0a


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/8f81f3d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f81f3d0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f81f3d0

Branch: refs/heads/cassandra-1.1
Commit: 8f81f3d0a5310972492b873155ff907d7a6fb033
Parents: 39b5015 c44a19a
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Tue Feb 28 00:45:00 2012 +0300
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Tue Feb 28 00:45:00 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt                                      |    1 +
 src/java/org/apache/cassandra/cli/CliClient.java |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f81f3d0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e66ffe1,525d85f..990e6ef
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -15,8 -11,8 +15,9 @@@
   * 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)
  Merged from 1.0:
   * remove the wait on hint future during write (CASSANDRA-3870)
   * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f81f3d0/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------


Mime
View raw message