You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2016/08/11 18:52:34 UTC
[1/2] cassandra git commit: Add Sigar to classes included in
clientutil.java
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 19245e5fa -> 2a828afdb
Add Sigar to classes included in clientutil.java
This is required as Sigar is now a dependency of UUIDGen.
Patch by Sylvain Lebresne; reviewed by Tyler Hobbs for CASSANDRA-11635
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b38d3a8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b38d3a8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b38d3a8
Branch: refs/heads/cassandra-3.0
Commit: 5b38d3a81e171eb414ae144191a4ff6423bef8b0
Parents: 2e90259
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Aug 11 13:41:22 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu Aug 11 13:41:22 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 ++++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b38d3a8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 05059cc..14bed81 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.8
+ * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635)
* Add decay to histograms and timers used for metrics (CASSANDRA-11752)
* Fix hanging stream session (CASSANDRA-10992)
* Add byteman support for testing (CASSANDRA-12377)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b38d3a8/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 49a0366..2426c91 100644
--- a/build.xml
+++ b/build.xml
@@ -917,6 +917,7 @@
<include name="org/apache/cassandra/exceptions/*.class" />
<include name="org/apache/cassandra/utils/CloseableIterator.class" />
<include name="org/apache/cassandra/io/util/*.class" />
+ <include name="org/apache/cassandra/utils/SigarLibrary.class" />
</fileset>
<manifest>
<attribute name="Implementation-Title" value="Cassandra"/>
@@ -1255,6 +1256,8 @@
-->
<target name="test-clientutil-jar" depends="build-test,jar" description="Test clientutil jar">
<junit fork="on" forkmode="perTest" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
+ <!-- Note that the test pass without that next line, but it prints an ugly error message -->
+ <jvmarg value="-Djava.library.path=${build.lib}/sigar-bin"/>
<test name="org.apache.cassandra.serializers.ClientUtilsTest" />
<formatter type="brief" usefile="false" />
<classpath>
@@ -1268,6 +1271,7 @@
<pathelement location="${build.lib}/logback-classic-1.1.3.jar" />
<pathelement location="${build.lib}/jackson-core-asl-1.9.2.jar" />
<pathelement location="${build.lib}/jackson-mapper-asl-1.9.2.jar" />
+ <pathelement location="${build.lib}/sigar-1.6.4.jar" />
<fileset dir="${build.dir.lib}">
<include name="**/junit*.jar" />
</fileset>
[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ty...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a828afd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a828afd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a828afd
Branch: refs/heads/cassandra-3.0
Commit: 2a828afdbfc7410b288c1681506dcbeecb9df3c2
Parents: 19245e5 5b38d3a
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Thu Aug 11 13:46:47 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu Aug 11 13:46:47 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 ++++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a828afd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0a1d406,14bed81..3ce9f9e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,8 +1,42 @@@
-2.2.8
+3.0.9
+ * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
+ * Backport CASSANDRA-12002 (CASSANDRA-12177)
+ * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100)
+ * Fix potential bad messaging service message for paged range reads
+ within mixed-version 3.x clusters (CASSANDRA-12249)
+ * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828)
+ * NullPointerException during compaction on table with static columns (CASSANDRA-12336)
+ * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)
+ * Fix upgrade of super columns on thrift (CASSANDRA-12335)
+ * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359)
+ * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277)
+ * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
+ * Lost counter writes in compact table and static columns (CASSANDRA-12219)
+ * AssertionError with MVs on updating a row that isn't indexed due to a null value (CASSANDRA-12247)
+ * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
+ * Add option to override compaction space check (CASSANDRA-12180)
+ * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114)
+ * Respond with v1/v2 protocol header when responding to driver that attempts
+ to connect with too low of a protocol version (CASSANDRA-11464)
+ * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
+ * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144)
+ * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107)
+ * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393)
+ * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147)
+ * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315)
+ * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
+ * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
+ * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996)
+ * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944)
+ * Fix column ordering of results with static columns for Thrift requests in
+ a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
+ those static columns in query results (CASSANDRA-12123)
+ * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
+ * Fix EOF exception when altering column type (CASSANDRA-11820)
+Merged from 2.2:
+ * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635)
* Add decay to histograms and timers used for metrics (CASSANDRA-11752)
* Fix hanging stream session (CASSANDRA-10992)
- * Add byteman support for testing (CASSANDRA-12377)
* Fix INSERT JSON, fromJson() support of smallint, tinyint types (CASSANDRA-12371)
* Restore JVM metric export for metric reporters (CASSANDRA-12312)
* Release sstables of failed stream sessions only when outgoing transfers are finished (CASSANDRA-11345)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a828afd/build.xml
----------------------------------------------------------------------