cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Tue, 15 Oct 2013 16:15:26 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	build.xml
	debian/changelog


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

Branch: refs/heads/trunk
Commit: 6bd71a5e5e21088fdd749854c8078040493d804e
Parents: 4eaca39 6165840
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Oct 15 18:15:05 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Oct 15 18:15:05 2013 +0200

----------------------------------------------------------------------
 .../apache/cassandra/metrics/ClientMetrics.java   | 18 ++++++++++++++++++
 .../org/apache/cassandra/pig/CqlTableTest.java    | 18 ++++++++++++++++++
 .../org/apache/cassandra/pig/PigTestBase.java     | 18 ++++++++++++++++++
 .../cassandra/pig/ThriftColumnFamilyTest.java     | 18 ++++++++++++++++++
 4 files changed, 72 insertions(+)
----------------------------------------------------------------------



Mime
View raw message