You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/12/27 23:58:42 UTC
[1/4] git commit: Update versioning for 2.0.4 release
Updated Branches:
refs/heads/cassandra-2.0 d56f8f293 -> dc2412243
refs/heads/trunk e60355563 -> e9a678319
Update versioning for 2.0.4 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d56f8f29
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d56f8f29
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d56f8f29
Branch: refs/heads/trunk
Commit: d56f8f2930fa95f53fe60039675229d8f5127d52
Parents: 2111a20
Author: Eric Evans <ee...@apache.org>
Authored: Fri Dec 27 12:42:15 2013 -0600
Committer: Eric Evans <ee...@apache.org>
Committed: Fri Dec 27 12:42:15 2013 -0600
----------------------------------------------------------------------
.rat-excludes | 1 +
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d56f8f29/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 78473b9..cf618c0 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -28,3 +28,4 @@ examples/triggers/build.xml
examples/triggers/conf/*
examples/hadoop_word_count/conf/log4j.properties
pylib/cqlshlib/test/**
+src/resources/org/apache/cassandra/config/version.properties
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d56f8f29/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e21091a..2fcb0fd 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="2.0.3"/>
+ <property name="base.version" value="2.0.4"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d56f8f29/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 571503e..7e9d7a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.4) unstable; urgency=medium
+
+ * New release
+
+ -- Eric Evans <ee...@apache.org> Fri, 27 Dec 2013 12:38:37 -0600
+
cassandra (2.0.3) unstable; urgency=low
* New release
[2/4] git commit: comment
Posted by jb...@apache.org.
comment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc241224
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc241224
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc241224
Branch: refs/heads/trunk
Commit: dc2412243b9b7edbab199e07fff20aa4e36fc84e
Parents: d56f8f2
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Dec 27 16:57:46 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Dec 27 16:57:46 2013 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/Component.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc241224/src/java/org/apache/cassandra/io/sstable/Component.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/Component.java b/src/java/org/apache/cassandra/io/sstable/Component.java
index 599e0ba..35efca5 100644
--- a/src/java/org/apache/cassandra/io/sstable/Component.java
+++ b/src/java/org/apache/cassandra/io/sstable/Component.java
@@ -55,7 +55,7 @@ public class Component
DIGEST("Digest.sha1"),
// holds the CRC32 for chunks in an a uncompressed file.
CRC("CRC.db"),
- // holds SSTable Index Summary and Boundaries
+ // holds SSTable Index Summary (sampling of Index component)
SUMMARY("Summary.db"),
// table of contents, stores the list of all components for the sstable
TOC("TOC.txt"),
[4/4] git commit: merge from 2.0
Posted by jb...@apache.org.
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9a67831
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9a67831
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9a67831
Branch: refs/heads/trunk
Commit: e9a6783198ef9a3742d22569585bb0e7f449c936
Parents: e603555 dc24122
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Dec 27 16:58:36 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Dec 27 16:58:36 2013 -0600
----------------------------------------------------------------------
.rat-excludes | 1 +
debian/changelog | 6 ++++++
src/java/org/apache/cassandra/io/sstable/Component.java | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9a67831/src/java/org/apache/cassandra/io/sstable/Component.java
----------------------------------------------------------------------
[3/4] git commit: comment
Posted by jb...@apache.org.
comment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc241224
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc241224
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc241224
Branch: refs/heads/cassandra-2.0
Commit: dc2412243b9b7edbab199e07fff20aa4e36fc84e
Parents: d56f8f2
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Dec 27 16:57:46 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Dec 27 16:57:46 2013 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/Component.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc241224/src/java/org/apache/cassandra/io/sstable/Component.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/Component.java b/src/java/org/apache/cassandra/io/sstable/Component.java
index 599e0ba..35efca5 100644
--- a/src/java/org/apache/cassandra/io/sstable/Component.java
+++ b/src/java/org/apache/cassandra/io/sstable/Component.java
@@ -55,7 +55,7 @@ public class Component
DIGEST("Digest.sha1"),
// holds the CRC32 for chunks in an a uncompressed file.
CRC("CRC.db"),
- // holds SSTable Index Summary and Boundaries
+ // holds SSTable Index Summary (sampling of Index component)
SUMMARY("Summary.db"),
// table of contents, stores the list of all components for the sstable
TOC("TOC.txt"),