natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.0' into cassandra-2.1 

Conflicts:
	src/java/org/apache/cassandra/db/Keyspace.java
This commit is contained in:
Brandon Williams 2014-06-13 07:50:41 -05:00
parent 55c48c2a00 be79ba500e
commit 30d3623bcb
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/cassandra/db/Keyspace.java
View File

@ -65,6 +65,8 @@ public class Keyspace
public final KeyspaceMetrics metric;
public final KeyspaceMetrics metric;
// It is possible to call Keyspace.open without a running daemon, so it makes sense to ensure
// proper directories here as well as in CassandraDaemon.
static