You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ms...@apache.org on 2017/03/02 00:48:39 UTC

[01/10] cassandra git commit: Fix 2.2 build on byteman-install dependency

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 06feaefba -> c0f99c4e6
  refs/heads/cassandra-3.0 815508f1c -> 143c50339
  refs/heads/cassandra-3.11 e345d4e7b -> 4599da218
  refs/heads/trunk 9ba3185b6 -> d74cc0802


Fix 2.2 build on byteman-install dependency


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

Branch: refs/heads/cassandra-2.2
Commit: c0f99c4e68da8e4e7f3d430b2cb45a762c1ff9f2
Parents: 06feaef
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Mar 1 18:47:07 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Mar 1 18:47:07 2017 -0600

----------------------------------------------------------------------
 build.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0f99c4e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6dbdb9e..867afa4 100644
--- a/build.xml
+++ b/build.xml
@@ -393,6 +393,7 @@
           <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/>
           <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/>
 
+          <dependency groupId="org.jboss.byteman" artifactId="byteman-install" version="${byteman.version}" scope="test"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}" scope="test"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}" scope="test"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}" scope="test"/>
@@ -528,6 +529,7 @@
         <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura"/>
         <dependency groupId="org.jacoco" artifactId="org.jacoco.agent"/>
         <dependency groupId="org.jacoco" artifactId="org.jacoco.ant"/>
+        <dependency groupId="org.jboss.byteman" artifactId="byteman-install" scope="test"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman" scope="test"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" scope="test"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" scope="test"/>


[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by ms...@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/143c5033
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/143c5033
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/143c5033

Branch: refs/heads/cassandra-3.0
Commit: 143c503395418ba87db015b07e6a9e98fa120803
Parents: 815508f c0f99c4
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Mar 1 18:47:23 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Mar 1 18:47:23 2017 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------



[04/10] cassandra git commit: Fix 2.2 build on byteman-install dependency

Posted by ms...@apache.org.
Fix 2.2 build on byteman-install dependency


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

Branch: refs/heads/trunk
Commit: c0f99c4e68da8e4e7f3d430b2cb45a762c1ff9f2
Parents: 06feaef
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Mar 1 18:47:07 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Mar 1 18:47:07 2017 -0600

----------------------------------------------------------------------
 build.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0f99c4e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6dbdb9e..867afa4 100644
--- a/build.xml
+++ b/build.xml
@@ -393,6 +393,7 @@
           <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/>
           <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/>
 
+          <dependency groupId="org.jboss.byteman" artifactId="byteman-install" version="${byteman.version}" scope="test"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}" scope="test"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}" scope="test"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}" scope="test"/>
@@ -528,6 +529,7 @@
         <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura"/>
         <dependency groupId="org.jacoco" artifactId="org.jacoco.agent"/>
         <dependency groupId="org.jacoco" artifactId="org.jacoco.ant"/>
+        <dependency groupId="org.jboss.byteman" artifactId="byteman-install" scope="test"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman" scope="test"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" scope="test"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" scope="test"/>


[02/10] cassandra git commit: Fix 2.2 build on byteman-install dependency

Posted by ms...@apache.org.
Fix 2.2 build on byteman-install dependency


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

Branch: refs/heads/cassandra-3.0
Commit: c0f99c4e68da8e4e7f3d430b2cb45a762c1ff9f2
Parents: 06feaef
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Mar 1 18:47:07 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Mar 1 18:47:07 2017 -0600

----------------------------------------------------------------------
 build.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0f99c4e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6dbdb9e..867afa4 100644
--- a/build.xml
+++ b/build.xml
@@ -393,6 +393,7 @@
           <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/>
           <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/>
 
+          <dependency groupId="org.jboss.byteman" artifactId="byteman-install" version="${byteman.version}" scope="test"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}" scope="test"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}" scope="test"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}" scope="test"/>
@@ -528,6 +529,7 @@
         <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura"/>
         <dependency groupId="org.jacoco" artifactId="org.jacoco.agent"/>
         <dependency groupId="org.jacoco" artifactId="org.jacoco.ant"/>
+        <dependency groupId="org.jboss.byteman" artifactId="byteman-install" scope="test"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman" scope="test"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" scope="test"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" scope="test"/>


[03/10] cassandra git commit: Fix 2.2 build on byteman-install dependency

Posted by ms...@apache.org.
Fix 2.2 build on byteman-install dependency


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

Branch: refs/heads/cassandra-3.11
Commit: c0f99c4e68da8e4e7f3d430b2cb45a762c1ff9f2
Parents: 06feaef
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Mar 1 18:47:07 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Mar 1 18:47:07 2017 -0600

----------------------------------------------------------------------
 build.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0f99c4e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6dbdb9e..867afa4 100644
--- a/build.xml
+++ b/build.xml
@@ -393,6 +393,7 @@
           <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/>
           <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/>
 
+          <dependency groupId="org.jboss.byteman" artifactId="byteman-install" version="${byteman.version}" scope="test"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}" scope="test"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}" scope="test"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}" scope="test"/>
@@ -528,6 +529,7 @@
         <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura"/>
         <dependency groupId="org.jacoco" artifactId="org.jacoco.agent"/>
         <dependency groupId="org.jacoco" artifactId="org.jacoco.ant"/>
+        <dependency groupId="org.jboss.byteman" artifactId="byteman-install" scope="test"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman" scope="test"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" scope="test"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" scope="test"/>


[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by ms...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 4599da2182722d3df9cd7b7000d600e316d31893
Parents: e345d4e 143c503
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Mar 1 18:47:42 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Mar 1 18:47:42 2017 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------



[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by ms...@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/143c5033
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/143c5033
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/143c5033

Branch: refs/heads/cassandra-3.11
Commit: 143c503395418ba87db015b07e6a9e98fa120803
Parents: 815508f c0f99c4
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Mar 1 18:47:23 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Mar 1 18:47:23 2017 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------



[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by ms...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 4599da2182722d3df9cd7b7000d600e316d31893
Parents: e345d4e 143c503
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Mar 1 18:47:42 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Mar 1 18:47:42 2017 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------



[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

Posted by ms...@apache.org.
Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: d74cc0802c976713415aa39838bcebe333753e12
Parents: 9ba3185 4599da2
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Mar 1 18:48:02 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Mar 1 18:48:02 2017 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------



[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by ms...@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/143c5033
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/143c5033
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/143c5033

Branch: refs/heads/trunk
Commit: 143c503395418ba87db015b07e6a9e98fa120803
Parents: 815508f c0f99c4
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Mar 1 18:47:23 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Mar 1 18:47:23 2017 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------