cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Date Fri, 15 Sep 2017 21:37:29 GMT
Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: bb542ce7110f48b2c60f6c52613d37ae406309fc
Parents: 8b5d1ac f9e7c2b
Author: Joel Knighton <jkni@apache.org>
Authored: Fri Sep 15 16:23:58 2017 -0500
Committer: Joel Knighton <jkni@apache.org>
Committed: Fri Sep 15 16:23:58 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt                                          | 1 +
 test/unit/org/apache/cassandra/db/CellTest.java      | 4 ++--
 test/unit/org/apache/cassandra/db/rows/RowsTest.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb542ce7/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb542ce7/test/unit/org/apache/cassandra/db/CellTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/CellTest.java
index 906da8a,ea009f6..660bc38
--- a/test/unit/org/apache/cassandra/db/CellTest.java
+++ b/test/unit/org/apache/cassandra/db/CellTest.java
@@@ -350,9 -349,9 +350,9 @@@ public class CellTes
      @Test
      public void testComplexCellReconcile()
      {
 -        ColumnDefinition m = cfm2.getColumnDefinition(new ColumnIdentifier("m", false));
 +        ColumnMetadata m = cfm2.getColumn(new ColumnIdentifier("m", false));
          int now1 = FBUtilities.nowInSeconds();
-         long ts1 = now1*1000000;
+         long ts1 = now1*1000000L;
  
  
          Cell r1m1 = BufferCell.live(m, ts1, bb(1), CellPath.create(bb(1)));

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb542ce7/test/unit/org/apache/cassandra/db/rows/RowsTest.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message