You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/08/23 12:31:22 UTC

[01/10] cassandra git commit: Support BigDecimal in cassanra-stress

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 df9e798de -> 5bee617fe
  refs/heads/cassandra-2.2 dd19a7fcf -> a6d654044
  refs/heads/cassandra-3.0 6e48573be -> 342e33ffb
  refs/heads/trunk 7aa49acf6 -> b1fb6b939


Support BigDecimal in cassanra-stress

patch by Sebastian Estevez; reviewed by Benedict for CASSANDRA-10048


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

Branch: refs/heads/cassandra-2.1
Commit: 5bee617fea68e7b745c18d14b9b7076ab6fe219b
Parents: df9e798
Author: phact <sd...@gmail.com>
Authored: Fri Aug 21 09:50:43 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sun Aug 23 11:27:16 2015 +0100

----------------------------------------------------------------------
 .../apache/cassandra/stress/StressProfile.java  |  3 +-
 .../stress/generate/values/BigDecimals.java     | 39 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bee617f/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
index 49c4682..192b535 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
@@ -502,6 +502,7 @@ public class StressProfile implements Serializable
                 case BOOLEAN:
                     return new Booleans(name, config);
                 case DECIMAL:
+                    return new BigDecimals(name, config);
                 case DOUBLE:
                     return new Doubles(name, config);
                 case FLOAT:
@@ -523,7 +524,7 @@ public class StressProfile implements Serializable
                 case LIST:
                     return new Lists(name, getGenerator(name, type.getTypeArguments().get(0), config), config);
                 default:
-                    throw new UnsupportedOperationException();
+                    throw new UnsupportedOperationException("Because of this name: "+name+" if you removed it from the yaml and are still seeing this, make sure to drop table");
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bee617f/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java
new file mode 100644
index 0000000..42758ed
--- /dev/null
+++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java
@@ -0,0 +1,39 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.cassandra.stress.generate.values;
+
+import org.apache.cassandra.db.marshal.DecimalType;
+
+import java.math.BigDecimal;
+
+public class BigDecimals extends Generator<BigDecimal>
+{
+    public BigDecimals(String name, GeneratorConfig config)
+    {
+        super(DecimalType.instance, config, name, BigDecimal.class);
+    }
+
+    @Override
+    public BigDecimal generate()
+    {
+        return BigDecimal.valueOf(identityDistribution.next());
+    }
+}


[04/10] cassandra git commit: Support BigDecimal in cassanra-stress

Posted by be...@apache.org.
Support BigDecimal in cassanra-stress

patch by Sebastian Estevez; reviewed by Benedict for CASSANDRA-10048


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

Branch: refs/heads/trunk
Commit: 5bee617fea68e7b745c18d14b9b7076ab6fe219b
Parents: df9e798
Author: phact <sd...@gmail.com>
Authored: Fri Aug 21 09:50:43 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sun Aug 23 11:27:16 2015 +0100

----------------------------------------------------------------------
 .../apache/cassandra/stress/StressProfile.java  |  3 +-
 .../stress/generate/values/BigDecimals.java     | 39 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bee617f/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
index 49c4682..192b535 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
@@ -502,6 +502,7 @@ public class StressProfile implements Serializable
                 case BOOLEAN:
                     return new Booleans(name, config);
                 case DECIMAL:
+                    return new BigDecimals(name, config);
                 case DOUBLE:
                     return new Doubles(name, config);
                 case FLOAT:
@@ -523,7 +524,7 @@ public class StressProfile implements Serializable
                 case LIST:
                     return new Lists(name, getGenerator(name, type.getTypeArguments().get(0), config), config);
                 default:
-                    throw new UnsupportedOperationException();
+                    throw new UnsupportedOperationException("Because of this name: "+name+" if you removed it from the yaml and are still seeing this, make sure to drop table");
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bee617f/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java
new file mode 100644
index 0000000..42758ed
--- /dev/null
+++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java
@@ -0,0 +1,39 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.cassandra.stress.generate.values;
+
+import org.apache.cassandra.db.marshal.DecimalType;
+
+import java.math.BigDecimal;
+
+public class BigDecimals extends Generator<BigDecimal>
+{
+    public BigDecimals(String name, GeneratorConfig config)
+    {
+        super(DecimalType.instance, config, name, BigDecimal.class);
+    }
+
+    @Override
+    public BigDecimal generate()
+    {
+        return BigDecimal.valueOf(identityDistribution.next());
+    }
+}


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

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

Branch: refs/heads/cassandra-2.2
Commit: a6d65404467117c5b69b982c3576afb7e583db55
Parents: dd19a7f 5bee617
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sun Aug 23 11:30:43 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sun Aug 23 11:30:43 2015 +0100

----------------------------------------------------------------------
 .../apache/cassandra/stress/StressProfile.java  |  3 +-
 .../stress/generate/values/BigDecimals.java     | 39 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6d65404/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
----------------------------------------------------------------------


[02/10] cassandra git commit: Support BigDecimal in cassanra-stress

Posted by be...@apache.org.
Support BigDecimal in cassanra-stress

patch by Sebastian Estevez; reviewed by Benedict for CASSANDRA-10048


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

Branch: refs/heads/cassandra-2.2
Commit: 5bee617fea68e7b745c18d14b9b7076ab6fe219b
Parents: df9e798
Author: phact <sd...@gmail.com>
Authored: Fri Aug 21 09:50:43 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sun Aug 23 11:27:16 2015 +0100

----------------------------------------------------------------------
 .../apache/cassandra/stress/StressProfile.java  |  3 +-
 .../stress/generate/values/BigDecimals.java     | 39 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bee617f/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
index 49c4682..192b535 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
@@ -502,6 +502,7 @@ public class StressProfile implements Serializable
                 case BOOLEAN:
                     return new Booleans(name, config);
                 case DECIMAL:
+                    return new BigDecimals(name, config);
                 case DOUBLE:
                     return new Doubles(name, config);
                 case FLOAT:
@@ -523,7 +524,7 @@ public class StressProfile implements Serializable
                 case LIST:
                     return new Lists(name, getGenerator(name, type.getTypeArguments().get(0), config), config);
                 default:
-                    throw new UnsupportedOperationException();
+                    throw new UnsupportedOperationException("Because of this name: "+name+" if you removed it from the yaml and are still seeing this, make sure to drop table");
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bee617f/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java
new file mode 100644
index 0000000..42758ed
--- /dev/null
+++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java
@@ -0,0 +1,39 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.cassandra.stress.generate.values;
+
+import org.apache.cassandra.db.marshal.DecimalType;
+
+import java.math.BigDecimal;
+
+public class BigDecimals extends Generator<BigDecimal>
+{
+    public BigDecimals(String name, GeneratorConfig config)
+    {
+        super(DecimalType.instance, config, name, BigDecimal.class);
+    }
+
+    @Override
+    public BigDecimal generate()
+    {
+        return BigDecimal.valueOf(identityDistribution.next());
+    }
+}


[03/10] cassandra git commit: Support BigDecimal in cassanra-stress

Posted by be...@apache.org.
Support BigDecimal in cassanra-stress

patch by Sebastian Estevez; reviewed by Benedict for CASSANDRA-10048


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

Branch: refs/heads/cassandra-3.0
Commit: 5bee617fea68e7b745c18d14b9b7076ab6fe219b
Parents: df9e798
Author: phact <sd...@gmail.com>
Authored: Fri Aug 21 09:50:43 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sun Aug 23 11:27:16 2015 +0100

----------------------------------------------------------------------
 .../apache/cassandra/stress/StressProfile.java  |  3 +-
 .../stress/generate/values/BigDecimals.java     | 39 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bee617f/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
index 49c4682..192b535 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
@@ -502,6 +502,7 @@ public class StressProfile implements Serializable
                 case BOOLEAN:
                     return new Booleans(name, config);
                 case DECIMAL:
+                    return new BigDecimals(name, config);
                 case DOUBLE:
                     return new Doubles(name, config);
                 case FLOAT:
@@ -523,7 +524,7 @@ public class StressProfile implements Serializable
                 case LIST:
                     return new Lists(name, getGenerator(name, type.getTypeArguments().get(0), config), config);
                 default:
-                    throw new UnsupportedOperationException();
+                    throw new UnsupportedOperationException("Because of this name: "+name+" if you removed it from the yaml and are still seeing this, make sure to drop table");
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bee617f/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java
new file mode 100644
index 0000000..42758ed
--- /dev/null
+++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java
@@ -0,0 +1,39 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.cassandra.stress.generate.values;
+
+import org.apache.cassandra.db.marshal.DecimalType;
+
+import java.math.BigDecimal;
+
+public class BigDecimals extends Generator<BigDecimal>
+{
+    public BigDecimals(String name, GeneratorConfig config)
+    {
+        super(DecimalType.instance, config, name, BigDecimal.class);
+    }
+
+    @Override
+    public BigDecimal generate()
+    {
+        return BigDecimal.valueOf(identityDistribution.next());
+    }
+}


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

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

Branch: refs/heads/cassandra-3.0
Commit: a6d65404467117c5b69b982c3576afb7e583db55
Parents: dd19a7f 5bee617
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sun Aug 23 11:30:43 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sun Aug 23 11:30:43 2015 +0100

----------------------------------------------------------------------
 .../apache/cassandra/stress/StressProfile.java  |  3 +-
 .../stress/generate/values/BigDecimals.java     | 39 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6d65404/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
----------------------------------------------------------------------


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

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

Branch: refs/heads/trunk
Commit: a6d65404467117c5b69b982c3576afb7e583db55
Parents: dd19a7f 5bee617
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sun Aug 23 11:30:43 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sun Aug 23 11:30:43 2015 +0100

----------------------------------------------------------------------
 .../apache/cassandra/stress/StressProfile.java  |  3 +-
 .../stress/generate/values/BigDecimals.java     | 39 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6d65404/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
----------------------------------------------------------------------


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

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

Branch: refs/heads/cassandra-3.0
Commit: 342e33ffb14d10c29d040fa12dbaf48d6f16e410
Parents: 6e48573 a6d6540
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sun Aug 23 11:30:57 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sun Aug 23 11:30:57 2015 +0100

----------------------------------------------------------------------
 .../apache/cassandra/stress/StressProfile.java  |  3 +-
 .../stress/generate/values/BigDecimals.java     | 39 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/342e33ff/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
----------------------------------------------------------------------


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

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

Branch: refs/heads/trunk
Commit: 342e33ffb14d10c29d040fa12dbaf48d6f16e410
Parents: 6e48573 a6d6540
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sun Aug 23 11:30:57 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sun Aug 23 11:30:57 2015 +0100

----------------------------------------------------------------------
 .../apache/cassandra/stress/StressProfile.java  |  3 +-
 .../stress/generate/values/BigDecimals.java     | 39 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/342e33ff/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
----------------------------------------------------------------------


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

Posted by be...@apache.org.
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: b1fb6b939ac892432ace5e7f5c7597bd573b669c
Parents: 7aa49ac 342e33f
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sun Aug 23 11:31:03 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sun Aug 23 11:31:03 2015 +0100

----------------------------------------------------------------------
 .../apache/cassandra/stress/StressProfile.java  |  3 +-
 .../stress/generate/values/BigDecimals.java     | 39 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------