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 2014/06/27 18:09:15 UTC
[5/6] git commit: merge from 2.1.0
merge from 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/e7dbdd89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7dbdd89
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7dbdd89
Branch: refs/heads/cassandra-2.1
Commit: e7dbdd8940b27f0cd15a450ddecc157e88cb1a83
Parents: c148e2a b8ee9da
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Jun 27 11:08:37 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Jun 27 11:08:37 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 6 +++++-
bin/cassandra.bat | 2 +-
bin/cassandra.ps1 | 2 +-
conf/cassandra-env.ps1 | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7dbdd89/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ea5cfdc,9a3ac17..7de31c5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,10 @@@
- 2.1.0
++2.1.1
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
++
++
+ 2.1.0
+ * (Windows) handle spaces in path names (CASSANDRA-7451)
Merged from 2.0:
* Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
* Support DISTINCT for static columns and fix behaviour when DISTINC is