You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/06/13 18:38:57 UTC
[5/8] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12025b7a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12025b7a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12025b7a
Branch: refs/heads/trunk
Commit: 12025b7ae7e1251bf07dba7652ef1390a6900af3
Parents: 30d3623 cc276fb
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jun 13 11:18:52 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jun 13 11:18:52 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Keyspace.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/12025b7a/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------