You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/07/06 18:26:46 UTC
[1/5] cassandra git commit: bump versions
Repository: cassandra
Updated Branches:
refs/heads/trunk 25308682d -> c5c973939
bump versions
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb875b4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb875b4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb875b4a
Branch: refs/heads/trunk
Commit: eb875b4af60c6bb622fef8e3b313f49bf3d5f017
Parents: ca2f022
Author: T Jake Luciani <ja...@apache.org>
Authored: Mon Jul 6 11:19:42 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Mon Jul 6 11:19:42 2015 -0400
----------------------------------------------------------------------
NEWS.txt | 8 ++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb875b4a/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 80776e8..d513e65 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -14,6 +14,14 @@ restore snapshots created with the previous major version using the
using the provided 'sstableupgrade' tool.
+2.1.8
+=====
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see 2.1 if you are upgrading
+ from a previous version.
+
2.1.7
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb875b4a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 18ad49f..bbb64a2 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.1.7"/>
+ <property name="base.version" value="2.1.8"/>
<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/eb875b4a/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index d7e1fd1..a540f38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.8) unstable; urgency=medium
+
+ * New release
+
+ -- Jake Luciani <ja...@apache.org> Mon, 06 Jul 2015 11:18:23 -0400
+
cassandra (2.1.7) unstable; urgency=medium
* New release
[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/269059e8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/269059e8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/269059e8
Branch: refs/heads/trunk
Commit: 269059e8eb09bfa03bdd6ade9c33d91cc0cf5f3b
Parents: 63e122c eb875b4
Author: T Jake Luciani <ja...@apache.org>
Authored: Mon Jul 6 11:20:44 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Mon Jul 6 11:20:44 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/5] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff74eaf0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff74eaf0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff74eaf0
Branch: refs/heads/trunk
Commit: ff74eaf0e05b9dfecfb9f04850791114da2b3cf4
Parents: 269059e db39257
Author: T Jake Luciani <ja...@apache.org>
Authored: Mon Jul 6 12:26:01 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Mon Jul 6 12:26:01 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 ++
...assandra-driver-internal-only-2.6.0c2.post.zip | Bin 0 -> 198346 bytes
lib/cassandra-driver-internal-only-2.6.0c2.zip | Bin 199328 -> 0 bytes
3 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff74eaf0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9973bbc,95dc8be..7c6b4ad
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,7 +1,28 @@@
-2.1.8
+2.2.0-rc2
+ * Re-enable memory-mapped I/O on Windows (CASSANDRA-9658)
+ * Warn when an extra-large partition is compacted (CASSANDRA-9643)
+ * (cqlsh) Allow setting the initial connection timeout (CASSANDRA-9601)
+ * BulkLoader has --transport-factory option but does not use it (CASSANDRA-9675)
+ * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
+ * Update cqlsh for UDFs (CASSANDRA-7556)
+ * Change Windows kernel default timer resolution (CASSANDRA-9634)
+ * Deprected sstable2json and json2sstable (CASSANDRA-9618)
+ * Allow native functions in user-defined aggregates (CASSANDRA-9542)
+ * Don't repair system_distributed by default (CASSANDRA-9621)
+ * Fix mixing min, max, and count aggregates for blob type (CASSANRA-9622)
+ * Rename class for DATE type in Java driver (CASSANDRA-9563)
+ * Duplicate compilation of UDFs on coordinator (CASSANDRA-9475)
+ * Fix connection leak in CqlRecordWriter (CASSANDRA-9576)
+ * Mlockall before opening system sstables & remove boot_without_jna option (CASSANDRA-9573)
+ * Add functions to convert timeuuid to date or time, deprecate dateOf and unixTimestampOf (CASSANDRA-9229)
+ * Make sure we cancel non-compacting sstables from LifecycleTransaction (CASSANDRA-9566)
+ * Fix deprecated repair JMX API (CASSANDRA-9570)
+ * Add logback metrics (CASSANDRA-9378)
+ * Update and refactor ant test/test-compression to run the tests in parallel (CASSANDRA-9583)
+ * Fix upgrading to new directory for secondary index (CASSANDRA-9687)
+Merged from 2.1:
+ * (cqlsh) Fix bad check for CQL compatibility when DESCRIBE'ing
+ COMPACT STORAGE tables with no clustering columns
- * Warn when an extra-large partition is compacted (CASSANDRA-9643)
* Eliminate strong self-reference chains in sstable ref tidiers (CASSANDRA-9656)
* Ensure StreamSession uses canonical sstable reader instances (CASSANDRA-9700)
* Ensure memtable book keeping is not corrupted in the event we shrink usage (CASSANDRA-9681)
[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5c97393
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5c97393
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5c97393
Branch: refs/heads/trunk
Commit: c5c97393921dc2d339c6e216e1076564ba0963b1
Parents: 2530868 ff74eaf
Author: T Jake Luciani <ja...@apache.org>
Authored: Mon Jul 6 12:26:32 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Mon Jul 6 12:26:32 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 ++
...assandra-driver-internal-only-2.6.0c2.post.zip | Bin 0 -> 198346 bytes
lib/cassandra-driver-internal-only-2.6.0c2.zip | Bin 199328 -> 0 bytes
3 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5c97393/CHANGES.txt
----------------------------------------------------------------------
[3/5] cassandra git commit: cqlsh: Fix bad DESCRIBE CQL-compat check
on COMPACT tables
Posted by ja...@apache.org.
cqlsh: Fix bad DESCRIBE CQL-compat check on COMPACT tables
Patch by Tyler Hobbs; reviewed by tjake for CASSANDRA-9647
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db39257c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db39257c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db39257c
Branch: refs/heads/trunk
Commit: db39257c34152f6ccf8d53784cea580dbfe1edad
Parents: eb875b4
Author: Tyler Hobbs <ty...@apache.org>
Authored: Fri Jul 3 10:22:58 2015 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Mon Jul 6 12:22:04 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 ++
...assandra-driver-internal-only-2.6.0c2.post.zip | Bin 0 -> 198346 bytes
lib/cassandra-driver-internal-only-2.6.0c2.zip | Bin 199328 -> 0 bytes
3 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/db39257c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 69cb32c..95dc8be 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.1.8
+ * (cqlsh) Fix bad check for CQL compatibility when DESCRIBE'ing
+ COMPACT STORAGE tables with no clustering columns
* Warn when an extra-large partition is compacted (CASSANDRA-9643)
* Eliminate strong self-reference chains in sstable ref tidiers (CASSANDRA-9656)
* Ensure StreamSession uses canonical sstable reader instances (CASSANDRA-9700)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/db39257c/lib/cassandra-driver-internal-only-2.6.0c2.post.zip
----------------------------------------------------------------------
diff --git a/lib/cassandra-driver-internal-only-2.6.0c2.post.zip b/lib/cassandra-driver-internal-only-2.6.0c2.post.zip
new file mode 100644
index 0000000..5fa57c7
Binary files /dev/null and b/lib/cassandra-driver-internal-only-2.6.0c2.post.zip differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/db39257c/lib/cassandra-driver-internal-only-2.6.0c2.zip
----------------------------------------------------------------------
diff --git a/lib/cassandra-driver-internal-only-2.6.0c2.zip b/lib/cassandra-driver-internal-only-2.6.0c2.zip
deleted file mode 100644
index cde49ec..0000000
Binary files a/lib/cassandra-driver-internal-only-2.6.0c2.zip and /dev/null differ