cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [07/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Tue, 26 Apr 2016 01:09:46 GMT
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/1d7c0bc2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d7c0bc2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d7c0bc2

Branch: refs/heads/trunk
Commit: 1d7c0bc210532743946ce1929c2ed11551ea4246
Parents: 5f99629 c43cf8d
Author: Yuki Morishita <yukim@apache.org>
Authored: Mon Apr 25 20:05:06 2016 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Mon Apr 25 20:05:06 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                      | 1 +
 bin/debug-cql                    | 8 ++++----
 bin/nodetool                     | 9 +++++----
 bin/sstablekeys                  | 9 +++++----
 bin/sstableloader                | 9 +++++----
 bin/sstablescrub                 | 9 +++++----
 bin/sstableupgrade               | 9 +++++----
 tools/bin/cassandra-stress       | 9 +++++----
 tools/bin/cassandra-stressd      | 9 +++++----
 tools/bin/json2sstable           | 9 +++++----
 tools/bin/sstable2json           | 9 +++++----
 tools/bin/sstableexpiredblockers | 9 +++++----
 tools/bin/sstablelevelreset      | 9 +++++----
 tools/bin/sstablemetadata        | 9 +++++----
 tools/bin/sstableofflinerelevel  | 9 +++++----
 tools/bin/sstablerepairedset     | 9 +++++----
 tools/bin/sstablesplit           | 9 +++++----
 17 files changed, 80 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d7c0bc2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index affb723,4f6a4db..1837a6e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -2.1.15
 +2.2.7
 + * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches and
 +          report errors correctly if workers processes crash on initialization (CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 +Merged from 2.1:
+  * Change order of directory searching for cassandra.in.sh to favor local one (CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values (CASSANDRA-11633)
   * clqsh: COPY FROM throws TypeError with Cython extensions enabled (CASSANDRA-11574)
   * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549)


Mime
View raw message