You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/07/21 14:51:47 UTC
[01/12] git commit: update versioning for 2.1.0-rc4 release
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 337e4a829 -> 875480958
refs/heads/cassandra-2.1 82fa5d507 -> 3b14f6a5d
refs/heads/cassandra-2.1.0 d872e2c74 -> df7bd7f72
refs/heads/trunk 8d8fed522 -> 2093270c7
update versioning for 2.1.0-rc4 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d872e2c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d872e2c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d872e2c7
Branch: refs/heads/cassandra-2.1
Commit: d872e2c74685c0c8c019b2ef46aefa443efa95b9
Parents: 8fd8832
Author: Eric Evans <ee...@apache.org>
Authored: Fri Jul 18 13:42:11 2014 -0500
Committer: Eric Evans <ee...@apache.org>
Committed: Fri Jul 18 13:42:11 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d872e2c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ff417b1..5ba30cc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-2.1.0-final
+2.1.0-rc4
* Updated memtable_cleanup_threshold and memtable_flush_writers defaults
(CASSANDRA-7551)
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d872e2c7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index fd0c72b..ca973cc 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.0-rc3"/>
+ <property name="base.version" value="2.1.0-rc4"/>
<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/d872e2c7/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 6f8e3ec..7a38d2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.0~rc4) unstable; urgency=medium
+
+ * New RC release
+
+ -- Eric Evans <ee...@apache.org> Fri, 18 Jul 2014 13:40:48 -0500
+
cassandra (2.1.0~rc3) unstable; urgency=medium
* New RC release
[11/12] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
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/3b14f6a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b14f6a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b14f6a5
Branch: refs/heads/cassandra-2.1
Commit: 3b14f6a5dbc91b3e8d2efa95840a61604dd6fbcb
Parents: 82fa5d5 df7bd7f
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 21 07:51:10 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 21 07:51:10 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
build.xml | 2 +-
conf/cassandra-env.sh | 4 ++--
debian/changelog | 6 ++++++
4 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b14f6a5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8fa96f6,5ba30cc..2aa2efa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,4 +1,15 @@@
+2.1.1
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Fail to start if commit log replay detects a problem (CASSANDRA-7125)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+ * Fix native protocol drop user type notification (CASSANDRA-7571)
+
+
- 2.1.0-final
+ 2.1.0-rc4
* Updated memtable_cleanup_threshold and memtable_flush_writers defaults
(CASSANDRA-7551)
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b14f6a5/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b14f6a5/conf/cassandra-env.sh
----------------------------------------------------------------------
[07/12] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df7bd7f7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df7bd7f7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df7bd7f7
Branch: refs/heads/cassandra-2.1
Commit: df7bd7f725f6df5102730de89647418dd9f9473d
Parents: d872e2c 8754809
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 21 07:50:18 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 21 07:50:18 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df7bd7f7/conf/cassandra-env.sh
----------------------------------------------------------------------
[03/12] git commit: Fix jvm version detection when JAVA_TOOL_OPTIONS
in environment
Posted by br...@apache.org.
Fix jvm version detection when JAVA_TOOL_OPTIONS in environment
Patch by Gregory Ramsperger, reviewed by brandonwilliams for
CASSANDRA-7572
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87548095
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87548095
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87548095
Branch: refs/heads/cassandra-2.1.0
Commit: 87548095859c210e7be8cc8bbb4a5aa1f857a6ad
Parents: 337e4a8
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 21 07:49:13 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 21 07:49:13 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/87548095/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 7604918..d4e6590 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -90,7 +90,7 @@ calculate_heap_sizes()
java_ver_output=`"${JAVA:-java}" -version 2>&1`
-jvmver=`echo "$java_ver_output" | awk -F'"' 'NR==1 {print $2}'`
+jvmver=`echo "$java_ver_output" | grep 'java version' | awk -F'"' 'NR==1 {print $2}'`
JVM_VERSION=${jvmver%_*}
JVM_PATCH_VERSION=${jvmver#*_}
@@ -100,7 +100,7 @@ if [ "$JVM_VERSION" \< "1.7" ] ; then
fi
-jvm=`echo "$java_ver_output" | awk 'NR==2 {print $1}'`
+jvm=`echo "$java_ver_output" | grep -A 1 'java version' | awk 'NR==2 {print $1}'`
case "$jvm" in
OpenJDK)
JVM_VENDOR=OpenJDK
[08/12] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df7bd7f7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df7bd7f7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df7bd7f7
Branch: refs/heads/cassandra-2.1.0
Commit: df7bd7f725f6df5102730de89647418dd9f9473d
Parents: d872e2c 8754809
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 21 07:50:18 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 21 07:50:18 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df7bd7f7/conf/cassandra-env.sh
----------------------------------------------------------------------
[12/12] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@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/2093270c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2093270c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2093270c
Branch: refs/heads/trunk
Commit: 2093270c7c51700996577fd679f644bcfb17239e
Parents: 8d8fed5 3b14f6a
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 21 07:51:21 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 21 07:51:21 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
build.xml | 2 +-
conf/cassandra-env.sh | 4 ++--
debian/changelog | 6 ++++++
4 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2093270c/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2093270c/build.xml
----------------------------------------------------------------------
[04/12] git commit: Fix jvm version detection when JAVA_TOOL_OPTIONS
in environment
Posted by br...@apache.org.
Fix jvm version detection when JAVA_TOOL_OPTIONS in environment
Patch by Gregory Ramsperger, reviewed by brandonwilliams for
CASSANDRA-7572
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87548095
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87548095
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87548095
Branch: refs/heads/trunk
Commit: 87548095859c210e7be8cc8bbb4a5aa1f857a6ad
Parents: 337e4a8
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 21 07:49:13 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 21 07:49:13 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/87548095/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 7604918..d4e6590 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -90,7 +90,7 @@ calculate_heap_sizes()
java_ver_output=`"${JAVA:-java}" -version 2>&1`
-jvmver=`echo "$java_ver_output" | awk -F'"' 'NR==1 {print $2}'`
+jvmver=`echo "$java_ver_output" | grep 'java version' | awk -F'"' 'NR==1 {print $2}'`
JVM_VERSION=${jvmver%_*}
JVM_PATCH_VERSION=${jvmver#*_}
@@ -100,7 +100,7 @@ if [ "$JVM_VERSION" \< "1.7" ] ; then
fi
-jvm=`echo "$java_ver_output" | awk 'NR==2 {print $1}'`
+jvm=`echo "$java_ver_output" | grep -A 1 'java version' | awk 'NR==2 {print $1}'`
case "$jvm" in
OpenJDK)
JVM_VENDOR=OpenJDK
[06/12] git commit: Fix jvm version detection when JAVA_TOOL_OPTIONS
in environment
Posted by br...@apache.org.
Fix jvm version detection when JAVA_TOOL_OPTIONS in environment
Patch by Gregory Ramsperger, reviewed by brandonwilliams for
CASSANDRA-7572
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87548095
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87548095
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87548095
Branch: refs/heads/cassandra-2.1
Commit: 87548095859c210e7be8cc8bbb4a5aa1f857a6ad
Parents: 337e4a8
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 21 07:49:13 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 21 07:49:13 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/87548095/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 7604918..d4e6590 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -90,7 +90,7 @@ calculate_heap_sizes()
java_ver_output=`"${JAVA:-java}" -version 2>&1`
-jvmver=`echo "$java_ver_output" | awk -F'"' 'NR==1 {print $2}'`
+jvmver=`echo "$java_ver_output" | grep 'java version' | awk -F'"' 'NR==1 {print $2}'`
JVM_VERSION=${jvmver%_*}
JVM_PATCH_VERSION=${jvmver#*_}
@@ -100,7 +100,7 @@ if [ "$JVM_VERSION" \< "1.7" ] ; then
fi
-jvm=`echo "$java_ver_output" | awk 'NR==2 {print $1}'`
+jvm=`echo "$java_ver_output" | grep -A 1 'java version' | awk 'NR==2 {print $1}'`
case "$jvm" in
OpenJDK)
JVM_VENDOR=OpenJDK
[09/12] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df7bd7f7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df7bd7f7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df7bd7f7
Branch: refs/heads/trunk
Commit: df7bd7f725f6df5102730de89647418dd9f9473d
Parents: d872e2c 8754809
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 21 07:50:18 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 21 07:50:18 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df7bd7f7/conf/cassandra-env.sh
----------------------------------------------------------------------
[05/12] git commit: Fix jvm version detection when JAVA_TOOL_OPTIONS
in environment
Posted by br...@apache.org.
Fix jvm version detection when JAVA_TOOL_OPTIONS in environment
Patch by Gregory Ramsperger, reviewed by brandonwilliams for
CASSANDRA-7572
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87548095
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87548095
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87548095
Branch: refs/heads/cassandra-2.0
Commit: 87548095859c210e7be8cc8bbb4a5aa1f857a6ad
Parents: 337e4a8
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 21 07:49:13 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 21 07:49:13 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/87548095/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 7604918..d4e6590 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -90,7 +90,7 @@ calculate_heap_sizes()
java_ver_output=`"${JAVA:-java}" -version 2>&1`
-jvmver=`echo "$java_ver_output" | awk -F'"' 'NR==1 {print $2}'`
+jvmver=`echo "$java_ver_output" | grep 'java version' | awk -F'"' 'NR==1 {print $2}'`
JVM_VERSION=${jvmver%_*}
JVM_PATCH_VERSION=${jvmver#*_}
@@ -100,7 +100,7 @@ if [ "$JVM_VERSION" \< "1.7" ] ; then
fi
-jvm=`echo "$java_ver_output" | awk 'NR==2 {print $1}'`
+jvm=`echo "$java_ver_output" | grep -A 1 'java version' | awk 'NR==2 {print $1}'`
case "$jvm" in
OpenJDK)
JVM_VENDOR=OpenJDK
[02/12] git commit: update versioning for 2.1.0-rc4 release
Posted by br...@apache.org.
update versioning for 2.1.0-rc4 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d872e2c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d872e2c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d872e2c7
Branch: refs/heads/trunk
Commit: d872e2c74685c0c8c019b2ef46aefa443efa95b9
Parents: 8fd8832
Author: Eric Evans <ee...@apache.org>
Authored: Fri Jul 18 13:42:11 2014 -0500
Committer: Eric Evans <ee...@apache.org>
Committed: Fri Jul 18 13:42:11 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d872e2c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ff417b1..5ba30cc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-2.1.0-final
+2.1.0-rc4
* Updated memtable_cleanup_threshold and memtable_flush_writers defaults
(CASSANDRA-7551)
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d872e2c7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index fd0c72b..ca973cc 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.0-rc3"/>
+ <property name="base.version" value="2.1.0-rc4"/>
<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/d872e2c7/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 6f8e3ec..7a38d2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.0~rc4) unstable; urgency=medium
+
+ * New RC release
+
+ -- Eric Evans <ee...@apache.org> Fri, 18 Jul 2014 13:40:48 -0500
+
cassandra (2.1.0~rc3) unstable; urgency=medium
* New RC release
[10/12] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
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/3b14f6a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b14f6a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b14f6a5
Branch: refs/heads/trunk
Commit: 3b14f6a5dbc91b3e8d2efa95840a61604dd6fbcb
Parents: 82fa5d5 df7bd7f
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 21 07:51:10 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 21 07:51:10 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
build.xml | 2 +-
conf/cassandra-env.sh | 4 ++--
debian/changelog | 6 ++++++
4 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b14f6a5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8fa96f6,5ba30cc..2aa2efa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,4 +1,15 @@@
+2.1.1
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Fail to start if commit log replay detects a problem (CASSANDRA-7125)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+ * Fix native protocol drop user type notification (CASSANDRA-7571)
+
+
- 2.1.0-final
+ 2.1.0-rc4
* Updated memtable_cleanup_threshold and memtable_flush_writers defaults
(CASSANDRA-7551)
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b14f6a5/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b14f6a5/conf/cassandra-env.sh
----------------------------------------------------------------------