cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [4/4] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Sun, 07 Jun 2015 11:48:26 GMT
Merge branch 'cassandra-2.2' into trunk

Conflicts:
	build.xml


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

Branch: refs/heads/trunk
Commit: eb266ce8d97b9f079ab662cb26258cd5c8c8746f
Parents: 8462377 99a84bc
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Sun Jun 7 12:47:41 2015 +0100
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Sun Jun 7 12:47:41 2015 +0100

----------------------------------------------------------------------
 debian/changelog                                 |  6 ++++++
 test/unit/org/apache/cassandra/MockSchema.java   | 19 ++++++++++++-------
 .../cassandra/db/lifecycle/HelpersTest.java      |  7 +++++++
 .../db/lifecycle/LifecycleTransactionTest.java   |  7 +++++++
 .../apache/cassandra/db/lifecycle/ViewTest.java  |  6 ++++++
 5 files changed, 38 insertions(+), 7 deletions(-)
----------------------------------------------------------------------



Mime
View raw message