You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jj...@apache.org on 2017/04/05 17:27:48 UTC
[1/3] cassandra git commit: Delete illegal character from
StandardTokenizerImpl.jflex,
which will cause compilation error in Chinese environment OS
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 2c1504cd7 -> bfdc1e0fd
refs/heads/trunk 201dd6f05 -> 305de286b
Delete illegal character from StandardTokenizerImpl.jflex, which will cause compilation error in Chinese environment OS
Closes #104
Patch by hxd; Reviewed by Jeff Jirsa for CASSANDRA-13417
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bfdc1e0f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfdc1e0f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bfdc1e0f
Branch: refs/heads/cassandra-3.11
Commit: bfdc1e0fdb3e4adad8d044203feaab8350dfdee8
Parents: 2c1504c
Author: hxd <sa...@gmail.com>
Authored: Wed Apr 5 09:46:34 2017 +0800
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Wed Apr 5 10:24:37 2017 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfdc1e0f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 28606d6..d3460d8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,7 @@
* More fixes to the TokenAllocator (CASSANDRA-12990)
* NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
* Address message coalescing regression (CASSANDRA-12676)
+ * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
Merged from 3.0:
* Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
* Fix 2i page size calculation when there are no regular columns (CASSANDRA-13400)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfdc1e0f/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex
index d0270ff..bdc35eb 100644
--- a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex
+++ b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex
@@ -22,7 +22,7 @@ import java.util.Arrays;
/**
* This class implements Word Break rules from the Unicode Text Segmentation
* algorithm, as specified in
- * <a href="http://unicode.org/reports/tr29/">Unicode Standard Annex #29</a>. \u2202
+ * <a href="http://unicode.org/reports/tr29/">Unicode Standard Annex #29</a>.
* <p/>
* Tokens produced are of the following types:
* <ul>
[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by jj...@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/305de286
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/305de286
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/305de286
Branch: refs/heads/trunk
Commit: 305de286b557a71e8b38f7a7a87ad4c4faa0f23d
Parents: 201dd6f bfdc1e0
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Wed Apr 5 10:24:52 2017 -0700
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Wed Apr 5 10:26:30 2017 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/305de286/CHANGES.txt
----------------------------------------------------------------------
[2/3] cassandra git commit: Delete illegal character from
StandardTokenizerImpl.jflex,
which will cause compilation error in Chinese environment OS
Posted by jj...@apache.org.
Delete illegal character from StandardTokenizerImpl.jflex, which will cause compilation error in Chinese environment OS
Closes #104
Patch by hxd; Reviewed by Jeff Jirsa for CASSANDRA-13417
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bfdc1e0f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfdc1e0f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bfdc1e0f
Branch: refs/heads/trunk
Commit: bfdc1e0fdb3e4adad8d044203feaab8350dfdee8
Parents: 2c1504c
Author: hxd <sa...@gmail.com>
Authored: Wed Apr 5 09:46:34 2017 +0800
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Wed Apr 5 10:24:37 2017 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfdc1e0f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 28606d6..d3460d8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,7 @@
* More fixes to the TokenAllocator (CASSANDRA-12990)
* NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
* Address message coalescing regression (CASSANDRA-12676)
+ * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
Merged from 3.0:
* Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
* Fix 2i page size calculation when there are no regular columns (CASSANDRA-13400)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfdc1e0f/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex
index d0270ff..bdc35eb 100644
--- a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex
+++ b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex
@@ -22,7 +22,7 @@ import java.util.Arrays;
/**
* This class implements Word Break rules from the Unicode Text Segmentation
* algorithm, as specified in
- * <a href="http://unicode.org/reports/tr29/">Unicode Standard Annex #29</a>. \u2202
+ * <a href="http://unicode.org/reports/tr29/">Unicode Standard Annex #29</a>.
* <p/>
* Tokens produced are of the following types:
* <ul>