You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/05/18 13:13:39 UTC

[01/15] cassandra git commit: CASSANDRA-10828: Allow usage of multiplier in start value of population sequence

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 6e6bde8ca -> 9359af2ea
  refs/heads/cassandra-2.2 e8e917ff9 -> 89344f182
  refs/heads/cassandra-3.0 54b743825 -> f73b48502
  refs/heads/cassandra-3.7 33ddb6798 -> ad546832f
  refs/heads/trunk f2443618f -> 050516c53


CASSANDRA-10828: Allow usage of multiplier in start value of population sequence


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

Branch: refs/heads/cassandra-2.1
Commit: 9359af2ea5bd80850f29a485dd054321bc946491
Parents: 6e6bde8
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Tue Dec 8 10:23:51 2015 +0100
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:09:06 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9359af2e/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
index 9425776..53c45ab 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
@@ -112,7 +112,7 @@ public class SettingsPopulation implements Serializable
 
         public SequentialOptions(String defaultLimit)
         {
-            populate = new OptionSimple("seq=", "[0-9]+\\.\\.+[0-9]+[MBK]?",
+            populate = new OptionSimple("seq=", "[0-9]+[MBK]?\\.\\.+[0-9]+[MBK]?",
                     "1.." + defaultLimit,
                     "Generate all seeds in sequence", true);
         }


[05/15] cassandra git commit: CASSANDRA-10828: Allow usage of multiplier in start value of population sequence

Posted by ja...@apache.org.
CASSANDRA-10828: Allow usage of multiplier in start value of population sequence


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

Branch: refs/heads/cassandra-3.7
Commit: 9359af2ea5bd80850f29a485dd054321bc946491
Parents: 6e6bde8
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Tue Dec 8 10:23:51 2015 +0100
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:09:06 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9359af2e/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
index 9425776..53c45ab 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
@@ -112,7 +112,7 @@ public class SettingsPopulation implements Serializable
 
         public SequentialOptions(String defaultLimit)
         {
-            populate = new OptionSimple("seq=", "[0-9]+\\.\\.+[0-9]+[MBK]?",
+            populate = new OptionSimple("seq=", "[0-9]+[MBK]?\\.\\.+[0-9]+[MBK]?",
                     "1.." + defaultLimit,
                     "Generate all seeds in sequence", true);
         }


[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7

Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7


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

Branch: refs/heads/trunk
Commit: ad546832ff9856a51f823c0591d6c1fa2b543e18
Parents: 33ddb67 f73b485
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed May 18 09:12:31 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:12:31 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

Branch: refs/heads/cassandra-3.7
Commit: f73b48502d8455ef27f915f5a5bc14a9682f8ab0
Parents: 54b7438 89344f1
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed May 18 09:10:06 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:10:06 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[03/15] cassandra git commit: CASSANDRA-10828: Allow usage of multiplier in start value of population sequence

Posted by ja...@apache.org.
CASSANDRA-10828: Allow usage of multiplier in start value of population sequence


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

Branch: refs/heads/trunk
Commit: 9359af2ea5bd80850f29a485dd054321bc946491
Parents: 6e6bde8
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Tue Dec 8 10:23:51 2015 +0100
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:09:06 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9359af2e/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
index 9425776..53c45ab 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
@@ -112,7 +112,7 @@ public class SettingsPopulation implements Serializable
 
         public SequentialOptions(String defaultLimit)
         {
-            populate = new OptionSimple("seq=", "[0-9]+\\.\\.+[0-9]+[MBK]?",
+            populate = new OptionSimple("seq=", "[0-9]+[MBK]?\\.\\.+[0-9]+[MBK]?",
                     "1.." + defaultLimit,
                     "Generate all seeds in sequence", true);
         }


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

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

Branch: refs/heads/trunk
Commit: f73b48502d8455ef27f915f5a5bc14a9682f8ab0
Parents: 54b7438 89344f1
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed May 18 09:10:06 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:10:06 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[08/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: 89344f182aac51e2047c7d4309c6cc5ed4a0b373
Parents: e8e917f 9359af2
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed May 18 09:09:43 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:09:43 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[02/15] cassandra git commit: CASSANDRA-10828: Allow usage of multiplier in start value of population sequence

Posted by ja...@apache.org.
CASSANDRA-10828: Allow usage of multiplier in start value of population sequence


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

Branch: refs/heads/cassandra-2.2
Commit: 9359af2ea5bd80850f29a485dd054321bc946491
Parents: 6e6bde8
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Tue Dec 8 10:23:51 2015 +0100
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:09:06 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9359af2e/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
index 9425776..53c45ab 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
@@ -112,7 +112,7 @@ public class SettingsPopulation implements Serializable
 
         public SequentialOptions(String defaultLimit)
         {
-            populate = new OptionSimple("seq=", "[0-9]+\\.\\.+[0-9]+[MBK]?",
+            populate = new OptionSimple("seq=", "[0-9]+[MBK]?\\.\\.+[0-9]+[MBK]?",
                     "1.." + defaultLimit,
                     "Generate all seeds in sequence", true);
         }


[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 89344f182aac51e2047c7d4309c6cc5ed4a0b373
Parents: e8e917f 9359af2
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed May 18 09:09:43 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:09:43 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[15/15] cassandra git commit: Merge branch 'cassandra-3.7' into trunk

Posted by ja...@apache.org.
Merge branch 'cassandra-3.7' into trunk


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

Branch: refs/heads/trunk
Commit: 050516c534501d370d2f2f1295b19c5ccef6462e
Parents: f244361 ad54683
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed May 18 09:12:53 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:12:53 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[13/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7

Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7


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

Branch: refs/heads/cassandra-3.7
Commit: ad546832ff9856a51f823c0591d6c1fa2b543e18
Parents: 33ddb67 f73b485
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed May 18 09:12:31 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:12:31 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[09/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.7
Commit: 89344f182aac51e2047c7d4309c6cc5ed4a0b373
Parents: e8e917f 9359af2
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed May 18 09:09:43 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:09:43 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[07/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: 89344f182aac51e2047c7d4309c6cc5ed4a0b373
Parents: e8e917f 9359af2
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed May 18 09:09:43 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:09:43 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[12/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

Branch: refs/heads/cassandra-3.0
Commit: f73b48502d8455ef27f915f5a5bc14a9682f8ab0
Parents: 54b7438 89344f1
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed May 18 09:10:06 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:10:06 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[04/15] cassandra git commit: CASSANDRA-10828: Allow usage of multiplier in start value of population sequence

Posted by ja...@apache.org.
CASSANDRA-10828: Allow usage of multiplier in start value of population sequence


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

Branch: refs/heads/cassandra-3.0
Commit: 9359af2ea5bd80850f29a485dd054321bc946491
Parents: 6e6bde8
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Tue Dec 8 10:23:51 2015 +0100
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed May 18 09:09:06 2016 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9359af2e/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
index 9425776..53c45ab 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
@@ -112,7 +112,7 @@ public class SettingsPopulation implements Serializable
 
         public SequentialOptions(String defaultLimit)
         {
-            populate = new OptionSimple("seq=", "[0-9]+\\.\\.+[0-9]+[MBK]?",
+            populate = new OptionSimple("seq=", "[0-9]+[MBK]?\\.\\.+[0-9]+[MBK]?",
                     "1.." + defaultLimit,
                     "Generate all seeds in sequence", true);
         }