cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 25 Feb 2015 16:59:30 GMT
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/3b3570c8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b3570c8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b3570c8

Branch: refs/heads/trunk
Commit: 3b3570c8ca02031d2e3ef1687356bfc7d211bbb7
Parents: ca63607 da9f030
Author: Yuki Morishita <yukim@apache.org>
Authored: Wed Feb 25 08:57:37 2015 -0800
Committer: Yuki Morishita <yukim@apache.org>
Committed: Wed Feb 25 08:57:37 2015 -0800

----------------------------------------------------------------------
 src/java/org/apache/cassandra/streaming/StreamManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b3570c8/src/java/org/apache/cassandra/streaming/StreamManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/streaming/StreamManager.java
index f40be99,4871078..728631d
--- a/src/java/org/apache/cassandra/streaming/StreamManager.java
+++ b/src/java/org/apache/cassandra/streaming/StreamManager.java
@@@ -63,7 -63,7 +63,7 @@@ public class StreamManager implements S
  
      public static class StreamRateLimiter
      {
-         private static final double ONE_MEGA_BIT = (1024 * 1024) / 8; // from bits
 -        private static final double BYTES_PER_MEGABIT = 1024 * 1024 / 8;
++        private static final double BYTES_PER_MEGABIT = (1024 * 1024) / 8; // from bits
          private static final RateLimiter limiter = RateLimiter.create(Double.MAX_VALUE);
          private static final RateLimiter interDCLimiter = RateLimiter.create(Double.MAX_VALUE);
          private final boolean isLocalDC;


Mime
View raw message