cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Sun, 14 Sep 2014 08:10:22 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 477c54c03cb708911d2173a0730b189ad844e2da
Parents: 0808166 0e652e7
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Sun Sep 14 09:09:57 2014 +0100
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Sun Sep 14 09:09:57 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../apache/cassandra/service/GCInspector.java   |  83 ++++++++++++-
 .../cassandra/service/GCInspectorMXBean.java    |  25 ++++
 .../org/apache/cassandra/tools/NodeProbe.java   |  11 +-
 .../org/apache/cassandra/tools/NodeTool.java    |  15 +++
 .../apache/cassandra/stress/StressAction.java   |   2 +-
 .../apache/cassandra/stress/StressMetrics.java  |  60 ++++++++--
 .../cassandra/stress/settings/SettingsPort.java |   3 +
 .../cassandra/stress/util/JmxCollector.java     | 119 +++++++++++++++++++
 .../apache/cassandra/stress/util/Timing.java    |  36 ++++--
 10 files changed, 330 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/477c54c0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c35e5b2,4c39f5c..e9d48e9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 +3.0
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Support Java source code for user-defined functions (CASSANDRA-7562)
 + * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Verify that UDF class methods are static (CASSANDRA-7781)
 + * Support pure user-defined functions (CASSANDRA-7395, 7740)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 +
 +
  2.1.1
+  * GCInspector more closely tracks GC; cassandra-stress and nodetool report it
   * nodetool won't output bogus ownership info without a keyspace (CASSANDRA-7173)
   * Add human readable option to nodetool commands (CASSANDRA-5433)
   * Don't try to set repairedAt on old sstables (CASSANDRA-7913)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/477c54c0/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/477c54c0/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/477c54c0/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
----------------------------------------------------------------------
diff --cc tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
index 0ef5df1,9e8e961..3f6f9c6
--- a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
@@@ -27,9 -28,11 +28,11 @@@ import java.util.concurrent.CountDownLa
  import java.util.concurrent.ThreadFactory;
  import java.util.concurrent.TimeUnit;
  
 +import com.google.common.util.concurrent.Uninterruptibles;
  import org.apache.commons.lang3.time.DurationFormatUtils;
 -
  import org.apache.cassandra.concurrent.NamedThreadFactory;
+ import org.apache.cassandra.stress.settings.StressSettings;
+ import org.apache.cassandra.stress.util.JmxCollector;
  import org.apache.cassandra.stress.util.Timing;
  import org.apache.cassandra.stress.util.TimingInterval;
  import org.apache.cassandra.stress.util.Uncertainty;


Mime
View raw message