You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by xe...@apache.org on 2012/02/29 19:27:59 UTC
[1/3] git commit: merge from 1.1.0
Updated Branches:
refs/heads/cassandra-1.1 49e134c73 -> 32f5d0641
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/32f5d064
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32f5d064
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32f5d064
Branch: refs/heads/cassandra-1.1
Commit: 32f5d06411a88a2cdb20408457a136ed9121d110
Parents: 49e134c 0447837
Author: Pavel Yaskevich <xe...@apache.org>
Authored: Wed Feb 29 21:26:28 2012 +0300
Committer: Pavel Yaskevich <xe...@apache.org>
Committed: Wed Feb 29 21:26:28 2012 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/cli/CliHelp.yaml | 12 ++++++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f5d064/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7960679,8350252..c0f4b17
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,9 -25,9 +30,10 @@@ Merged from 1.0
* always compact away deleted hints immediately after handoff (CASSANDRA-3955)
* delete hints from dropped ColumnFamilies on handoff instead of
erroring out (CASSANDRA-3975)
+ * add CompositeType ref to the CLI doc for create/update column family (CASSANDRA-3980)
+
1.1-beta1
* add nodetool rebuild_index (CASSANDRA-3583)
* add nodetool rangekeysample (CASSANDRA-2917)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f5d064/src/resources/org/apache/cassandra/cli/CliHelp.yaml
----------------------------------------------------------------------