cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Mon, 10 Oct 2016 13:52:24 GMT
Merge branch 'cassandra-3.X' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25a3759f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25a3759f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25a3759f

Branch: refs/heads/trunk
Commit: 25a3759f1ae40592fb69d79a7e38f3d3d173868a
Parents: 03e2e0a 1bc736d
Author: T Jake Luciani <jake@apache.org>
Authored: Mon Oct 10 09:51:55 2016 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Mon Oct 10 09:51:55 2016 -0400

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 .../src/org/apache/cassandra/stress/generate/values/UUIDs.java    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25a3759f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 373ad02,f4dda82..74509fa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +4.0
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
 +
 +
  3.10
+  * Fix cassandra-stress to use single seed in UUID generation (CASSANDRA-12729)
   * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
   * Config class uses boxed types but DD exposes primitive types (CASSANDRA-12199)
   * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)


Mime
View raw message