cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk
Date Wed, 28 Oct 2015 16:47:55 GMT
Merge branch cassandra-3.0 into trunk


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

Branch: refs/heads/trunk
Commit: a4fe865d4f8cb7ca8d14191d6d9ccf6ac1f79eb3
Parents: 9be01e3 3615da5
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Wed Oct 28 17:47:07 2015 +0100
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Wed Oct 28 17:47:33 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../db/partitions/PartitionUpdate.java          |  1 +
 .../db/partition/PartitionUpdateTest.java       | 67 ++++++++++++++++++++
 3 files changed, 69 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4fe865d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 04cefae,c51cb51..29117e0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix PartitionUpdate.operationCount()for updates with static column operations (CASSANDRA-10606)
   * Fix thrift get() queries with defined columns (CASSANDRA-10586)
   * Fix marking of indexes as built and removed (CASSANDRA-10601)
   * Skip initialization of non-registered 2i instances, remove Index::getIndexName (CASSANDRA-10595)


Mime
View raw message