You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/08/17 13:41:44 UTC
[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
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/d4d71cd3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4d71cd3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4d71cd3
Branch: refs/heads/trunk
Commit: d4d71cd331d9119f718b1ef6e4ed2bb3a1258ac1
Parents: 6966fcd 5694a2a
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Aug 17 15:38:12 2016 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Aug 17 15:38:12 2016 +0200
----------------------------------------------------------------------
test/conf/logback-test.xml | 2 +-
test/unit/org/apache/cassandra/cql3/CQLTester.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4d71cd3/test/conf/logback-test.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4d71cd3/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------