cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [1/2] cassandra git commit: Add Sigar to classes included in clientutil.java
Date Thu, 11 Aug 2016 18:52:34 GMT
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 <sylvain@datastax.com>
Authored: Thu Aug 11 13:41:22 2016 -0500
Committer: Tyler Hobbs <tylerlhobbs@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>


Mime
View raw message