You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/05/22 20:42:06 UTC
[1/2] cassandra git commit: Fix compiler warning about using _ as an
identifier
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 0d24b1a80 -> 490053820
Fix compiler warning about using _ as an identifier
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/744db701
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/744db701
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/744db701
Branch: refs/heads/cassandra-2.2
Commit: 744db701467e42cf19f9251d942fd9e3a4af2dd0
Parents: 4362e71
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri May 22 13:40:25 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri May 22 13:40:25 2015 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/io/util/DataOutputTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/744db701/test/unit/org/apache/cassandra/io/util/DataOutputTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/util/DataOutputTest.java b/test/unit/org/apache/cassandra/io/util/DataOutputTest.java
index 7110d1d..2063e9a 100644
--- a/test/unit/org/apache/cassandra/io/util/DataOutputTest.java
+++ b/test/unit/org/apache/cassandra/io/util/DataOutputTest.java
@@ -247,7 +247,7 @@ public class DataOutputTest
test.readInt();
assert false;
}
- catch (EOFException _)
+ catch (EOFException exc)
{
}
}
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
test/unit/org/apache/cassandra/io/util/DataOutputTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49005382
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49005382
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49005382
Branch: refs/heads/cassandra-2.2
Commit: 490053820c47cc9cd8a9bf5057bcc516c20a5be9
Parents: 0d24b1a 744db70
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri May 22 13:41:56 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri May 22 13:41:56 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------