You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/24 16:49:23 UTC
[16/50] git commit: Merge branch 'cassandra-1.1' into trunk
Merge branch 'cassandra-1.1' into trunk
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/tools/NodeProbe.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a45c6c5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a45c6c5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a45c6c5
Branch: refs/heads/cassandra-1.1
Commit: 8a45c6c506afc9c557e10936c8471959484d59b2
Parents: 4af2bfe 058307b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Feb 20 11:15:05 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Feb 20 11:15:05 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
.../org/apache/cassandra/config/CFMetaData.java | 2 +-
src/java/org/apache/cassandra/cql3/Cql.g | 5 ++++-
.../cassandra/cql3/statements/SelectStatement.java | 15 ++++++++++++++-
.../org/apache/cassandra/db/ColumnFamilyStore.java | 11 +++++++++++
.../cassandra/db/ColumnFamilyStoreMBean.java | 12 ++++++++++++
src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++--
7 files changed, 46 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a45c6c5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 31a8a32,b8ffb10..46e009f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,10 +1,11 @@@
1.1-dev
* avoid unproductive deserializing of cached rows during compaction
(CASSANDRA-3921)
- * Show Effective Owership via Nodetool ring <keyspace> (CASSANDRA-3412)
* fix concurrency issues with CQL keyspace creation (CASSANDRA-3903)
+ * Show Effective Owership via Nodetool ring <keyspace> (CASSANDRA-3412)
+ * Update ORDER BY syntax for CQL3 (CASSANDRA-3925)
+
1.1-beta1
* add nodetool rebuild_index (CASSANDRA-3583)
* add nodetool rangekeysample (CASSANDRA-2917)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a45c6c5/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a45c6c5/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------