cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 14 Oct 2015 15:38:30 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/50da872f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50da872f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50da872f

Branch: refs/heads/cassandra-2.2
Commit: 50da872f20bdd8fae157fa478067a81df33ecf43
Parents: 7cab327 3c0a1a5
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Oct 14 16:38:19 2015 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Oct 14 16:38:19 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/50da872f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 57c6ff9,1338c6f..4da4aab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -2.1.12
 +2.2.4
 +Merged from 2.1:
+  * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
   * Don't allow startup if the node's rack has changed (CASSANDRA-10242)
   * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
  


Mime
View raw message