cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 24 Oct 2014 17:08:09 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java


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

Branch: refs/heads/trunk
Commit: 209ea6e9b1c02f37576ae195bf59803d31b30cbb
Parents: 2976e69 860cde7
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Fri Oct 24 12:07:55 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Fri Oct 24 12:07:55 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                  | 2 ++
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 7 +++++++
 src/java/org/apache/cassandra/thrift/ThriftServer.java       | 6 +++---
 3 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/209ea6e9/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/209ea6e9/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 00e875b,34bd39a..a448463
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -66,6 -66,6 +66,7 @@@ import org.apache.cassandra.net.Messagi
  import org.apache.cassandra.scheduler.IRequestScheduler;
  import org.apache.cassandra.scheduler.NoScheduler;
  import org.apache.cassandra.service.CacheService;
++import org.apache.cassandra.thrift.ThriftServer;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.FBUtilities;
  import org.apache.cassandra.utils.memory.HeapPool;


Mime
View raw message