You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/04/24 01:03:54 UTC
[1/3] git commit: Fix CFMetaData#getColumnDefinitionFromColumnName()
Repository: cassandra
Updated Branches:
refs/heads/trunk 3e6aa753e -> e6325fa77
Fix CFMetaData#getColumnDefinitionFromColumnName()
patch by Sergio Bossa; reviewed by Aleksey Yeschenko for CASSANDRA-7047
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3550fe4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3550fe4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3550fe4
Branch: refs/heads/trunk
Commit: c3550fe40c298bb7d31735ac1aedfc9fab84c169
Parents: c1eb74c
Author: Sergio Bossa <se...@gmail.com>
Authored: Thu Apr 24 01:56:51 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Apr 24 01:56:51 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/CFMetaData.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3550fe4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 68c335d..8b1ed54 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
* USING TIMESTAMP for batches does not work (CASSANDRA-7053)
* Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
* Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
+ * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
Merged from 1.2:
* Fix batchlog to account for CF truncation records (CASSANDRA-6999)
* Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3550fe4/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index be18d1b..23f912e 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -1219,7 +1219,7 @@ public final class CFMetaData
else
{
if (def.componentIndex >= components.length)
- break;
+ continue;
toCompare = components[def.componentIndex];
}
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/CFMetaData.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6acbb33f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6acbb33f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6acbb33f
Branch: refs/heads/trunk
Commit: 6acbb33fa4191e60d5e9cdd58f815dea7c2ff616
Parents: 072b488 c3550fe
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Apr 24 02:03:16 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Apr 24 02:03:16 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6325fa7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6325fa7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6325fa7
Branch: refs/heads/trunk
Commit: e6325fa7764670bf9e55c2a860e181287083c327
Parents: 3e6aa75 6acbb33
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Apr 24 02:03:42 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Apr 24 02:03:42 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------