You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/07/28 12:50:38 UTC
[1/3] git commit: Don't swap max/min column names when mutating
sstable metadata.
Repository: cassandra
Updated Branches:
refs/heads/trunk f3aa83be1 -> 0fd1a0bb4
Don't swap max/min column names when mutating sstable metadata.
Patch by marcuse; reviewed by benedict for CASSANDRA-7596.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee62ae10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee62ae10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee62ae10
Branch: refs/heads/trunk
Commit: ee62ae104ee2c69d852b488f904b1854aa58aa2a
Parents: 6f15fe2
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Jul 28 12:48:24 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Jul 28 12:48:24 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/io/sstable/metadata/StatsMetadata.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee62ae10/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0a1ba51..c6aaef9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@
* Fix tracing of range slices and secondary index lookups that are local
to the coordinator (CASSANDRA-7599)
* Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
+ * Don't swap max/min col names when mutating sstable metadata (CASSANDRA-7596)
Merged from 2.0:
* Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
* Always merge ranges owned by a single node (CASSANDRA-6930)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee62ae10/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
index 900bd4e..a557b88 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
@@ -124,8 +124,8 @@ public class StatsMetadata extends MetadataComponent
compressionRatio,
estimatedTombstoneDropTime,
newLevel,
- maxColumnNames,
minColumnNames,
+ maxColumnNames,
hasLegacyCounterShards,
repairedAt);
}
@@ -141,8 +141,8 @@ public class StatsMetadata extends MetadataComponent
compressionRatio,
estimatedTombstoneDropTime,
sstableLevel,
- maxColumnNames,
minColumnNames,
+ maxColumnNames,
hasLegacyCounterShards,
newRepairedAt);
}
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ma...@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/0fd1a0bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0fd1a0bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0fd1a0bb
Branch: refs/heads/trunk
Commit: 0fd1a0bb47f66eaa29ce821aa4836c52b65e46e1
Parents: f3aa83b 2236afb
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Jul 28 12:49:28 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Jul 28 12:49:28 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/io/sstable/metadata/StatsMetadata.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fd1a0bb/CHANGES.txt
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2236afb7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2236afb7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2236afb7
Branch: refs/heads/trunk
Commit: 2236afb7a06725f9ceb13bab8c2180eb0d6134f5
Parents: 3744d77 ee62ae1
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Jul 28 12:49:06 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Jul 28 12:49:06 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/io/sstable/metadata/StatsMetadata.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2236afb7/CHANGES.txt
----------------------------------------------------------------------