You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/12/03 21:37:07 UTC
[1/3] cassandra git commit: Fix stress profile parsing on Windows
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 fffa6d8e6 -> 4b01e8fc5
Fix stress profile parsing on Windows
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-10808
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8764242
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8764242
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8764242
Branch: refs/heads/cassandra-3.0
Commit: b876424228d320fdda5e9c53fc7b966f4400ffb3
Parents: b85da71
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Dec 3 21:25:42 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Dec 3 21:25:42 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
.../apache/cassandra/stress/settings/SettingsCommandUser.java | 7 +------
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8764242/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c5e2d5..1a2887a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.1.13
+ * Fix Stress profile parsing on Windows (CASSANDRA-10808)
+
+
2.1.12
* Fix incremental repair hang when replica is down (CASSANDRA-10288)
* Avoid writing range tombstones after END_OF_ROW marker (CASSANDRA-10791)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8764242/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
index 5228828..8440e8e 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
@@ -55,12 +55,7 @@ public class SettingsCommandUser extends SettingsCommand
String yamlPath = options.profile.value();
File yamlFile = new File(yamlPath);
- if (yamlFile.exists())
- {
- yamlPath = "file:///" + yamlFile.getAbsolutePath();
- }
-
- profile = StressProfile.load(URI.create(yamlPath));
+ profile = StressProfile.load(yamlFile.exists() ? yamlFile.toURI() : URI.create(yamlPath));
if (ratios.size() == 0)
throw new IllegalArgumentException("Must specify at least one command with a non-zero ratio");
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by bl...@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/4b01e8fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b01e8fc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b01e8fc
Branch: refs/heads/cassandra-3.0
Commit: 4b01e8fc5c6931516ced47a08e1e6fdaaee7ed0f
Parents: fffa6d8 7e3e119
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Dec 3 21:36:33 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Dec 3 21:36:33 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/stress/settings/SettingsCommandUser.java | 7 +------
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b01e8fc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 507a709,7932f51..dd5d22b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -28,8 -13,18 +28,9 @@@ Merged from 2.2
* Fix SimpleDateType type compatibility (CASSANDRA-10027)
* (Hadoop) fix splits calculation (CASSANDRA-10640)
* (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
- * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
- * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
- * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
- * Expose phi values from failure detector via JMX and tweak debug
- and trace logging (CASSANDRA-9526)
- * Fix RangeNamesQueryPager (CASSANDRA-10509)
- * Deprecate Pig support (CASSANDRA-10542)
- * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
- * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large buffers (CASSANDRA-10592)
Merged from 2.1:
++ * Fix Stress profile parsing on Windows (CASSANDRA-10808)
* Fix incremental repair hang when replica is down (CASSANDRA-10288)
- * Avoid writing range tombstones after END_OF_ROW marker (CASSANDRA-10791)
* Optimize the way we check if a token is repaired in anticompaction (CASSANDRA-10768)
* Add proper error handling to stream receiver (CASSANDRA-10774)
* Warn or fail when changing cluster topology live (CASSANDRA-10243)
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by bl...@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/7e3e1191
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7e3e1191
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7e3e1191
Branch: refs/heads/cassandra-3.0
Commit: 7e3e1191b9a02b2a638f8a12e2cc793c0a4735ab
Parents: 15f03ab b876424
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Dec 3 21:30:45 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Dec 3 21:30:45 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
.../apache/cassandra/stress/settings/SettingsCommandUser.java | 7 +------
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e3e1191/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 12accac,1a2887a..7932f51
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,8 +1,28 @@@
-2.1.13
+2.2.5
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
-
++Merged from 2.1:
+ * Fix Stress profile parsing on Windows (CASSANDRA-10808)
-
-2.1.12
+2.2.4
+ * Show CQL help in cqlsh in web browser (CASSANDRA-7225)
+ * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775)
+ * Reject index queries while the index is building (CASSANDRA-8505)
+ * CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC (CASSANDRA-10747)
+ * Fix JSON update with prepared statements (CASSANDRA-10631)
+ * Don't do anticompaction after subrange repair (CASSANDRA-10422)
+ * Fix SimpleDateType type compatibility (CASSANDRA-10027)
+ * (Hadoop) fix splits calculation (CASSANDRA-10640)
+ * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
+ * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
+ * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
+ * Expose phi values from failure detector via JMX and tweak debug
+ and trace logging (CASSANDRA-9526)
+ * Fix RangeNamesQueryPager (CASSANDRA-10509)
+ * Deprecate Pig support (CASSANDRA-10542)
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+ * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large buffers (CASSANDRA-10592)
+Merged from 2.1:
* Fix incremental repair hang when replica is down (CASSANDRA-10288)
* Avoid writing range tombstones after END_OF_ROW marker (CASSANDRA-10791)
* Optimize the way we check if a token is repaired in anticompaction (CASSANDRA-10768)