You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ca...@apache.org on 2016/02/18 21:59:09 UTC
[1/6] cassandra git commit: cqlsh cannot be called through symlink
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 71f440607 -> 4985fcc86
refs/heads/cassandra-3.0 9b5df24f5 -> 650333508
refs/heads/trunk 14420a958 -> aca2a1dcf
cqlsh cannot be called through symlink
patch by Benjamin Zarzycki; reviewed by Carl Yeksigian for CASSANDRA-11037
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4985fcc8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4985fcc8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4985fcc8
Branch: refs/heads/cassandra-2.2
Commit: 4985fcc86f8b28887c5ed41e538354ab07cb6f70
Parents: 71f4406
Author: Carl Yeksigian <ca...@apache.org>
Authored: Thu Feb 18 15:48:54 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Thu Feb 18 15:48:54 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4985fcc8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 10f23af..d3dcdbc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
* fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
* Protect from keyspace dropped during repair (CASSANDRA-11065)
* Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4985fcc8/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 5594f82..89d094f 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -16,4 +16,4 @@
# limitations under the License.
-python "`dirname "$0"`/cqlsh.py" "$@"
+python "`python -c "import os;print(os.path.dirname(os.path.realpath('$0')))"`/cqlsh.py" "$@"
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ca...@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/65033350
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65033350
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65033350
Branch: refs/heads/trunk
Commit: 65033350891aa58b772c026c46818bb300102872
Parents: 9b5df24 4985fcc
Author: Carl Yeksigian <ca...@apache.org>
Authored: Thu Feb 18 15:50:44 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Thu Feb 18 15:50:44 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/65033350/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ae9cd75,d3dcdbc..275bc04
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
-2.2.6
+3.0.4
+ * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
+ * Add query time validation method on Index (CASSANDRA-11043)
+ * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
+ * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
+ * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156)
+ * Fix wrong rack counting and invalid conditions check for TokenAllocation
+ (CASSANDRA-11139)
+ * Avoid creating empty hint files (CASSANDRA-11090)
+ * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120)
+ * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062)
+ * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001)
+ * Add dropped_columns to the list of schema table so it gets handled
+ properly (CASSANDRA-11050)
+Merged from 2.2:
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
* fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
* Protect from keyspace dropped during repair (CASSANDRA-11065)
* Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
[3/6] cassandra git commit: cqlsh cannot be called through symlink
Posted by ca...@apache.org.
cqlsh cannot be called through symlink
patch by Benjamin Zarzycki; reviewed by Carl Yeksigian for CASSANDRA-11037
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4985fcc8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4985fcc8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4985fcc8
Branch: refs/heads/trunk
Commit: 4985fcc86f8b28887c5ed41e538354ab07cb6f70
Parents: 71f4406
Author: Carl Yeksigian <ca...@apache.org>
Authored: Thu Feb 18 15:48:54 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Thu Feb 18 15:48:54 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4985fcc8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 10f23af..d3dcdbc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
* fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
* Protect from keyspace dropped during repair (CASSANDRA-11065)
* Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4985fcc8/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 5594f82..89d094f 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -16,4 +16,4 @@
# limitations under the License.
-python "`dirname "$0"`/cqlsh.py" "$@"
+python "`python -c "import os;print(os.path.dirname(os.path.realpath('$0')))"`/cqlsh.py" "$@"
[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ca...@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/65033350
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65033350
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65033350
Branch: refs/heads/cassandra-3.0
Commit: 65033350891aa58b772c026c46818bb300102872
Parents: 9b5df24 4985fcc
Author: Carl Yeksigian <ca...@apache.org>
Authored: Thu Feb 18 15:50:44 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Thu Feb 18 15:50:44 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/65033350/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ae9cd75,d3dcdbc..275bc04
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
-2.2.6
+3.0.4
+ * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
+ * Add query time validation method on Index (CASSANDRA-11043)
+ * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
+ * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
+ * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156)
+ * Fix wrong rack counting and invalid conditions check for TokenAllocation
+ (CASSANDRA-11139)
+ * Avoid creating empty hint files (CASSANDRA-11090)
+ * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120)
+ * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062)
+ * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001)
+ * Add dropped_columns to the list of schema table so it gets handled
+ properly (CASSANDRA-11050)
+Merged from 2.2:
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
* fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
* Protect from keyspace dropped during repair (CASSANDRA-11065)
* Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
[2/6] cassandra git commit: cqlsh cannot be called through symlink
Posted by ca...@apache.org.
cqlsh cannot be called through symlink
patch by Benjamin Zarzycki; reviewed by Carl Yeksigian for CASSANDRA-11037
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4985fcc8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4985fcc8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4985fcc8
Branch: refs/heads/cassandra-3.0
Commit: 4985fcc86f8b28887c5ed41e538354ab07cb6f70
Parents: 71f4406
Author: Carl Yeksigian <ca...@apache.org>
Authored: Thu Feb 18 15:48:54 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Thu Feb 18 15:48:54 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4985fcc8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 10f23af..d3dcdbc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
* fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
* Protect from keyspace dropped during repair (CASSANDRA-11065)
* Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4985fcc8/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 5594f82..89d094f 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -16,4 +16,4 @@
# limitations under the License.
-python "`dirname "$0"`/cqlsh.py" "$@"
+python "`python -c "import os;print(os.path.dirname(os.path.realpath('$0')))"`/cqlsh.py" "$@"
[6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ca...@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/aca2a1dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aca2a1dc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aca2a1dc
Branch: refs/heads/trunk
Commit: aca2a1dcfdc5210a68ea13affdd819f8f4108a54
Parents: 14420a9 6503335
Author: Carl Yeksigian <ca...@apache.org>
Authored: Thu Feb 18 15:51:44 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Thu Feb 18 15:55:14 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 +--
bin/cqlsh | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aca2a1dc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9821f1c,275bc04..830bef1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,4 +1,31 @@@
-3.0.4
+3.4
+ * fix TrackerTest to handle new notifications (CASSANDRA-11178)
+ * add SASI validation for partitioner and complex columns (CASSANDRA-11169)
+ * Add caching of encrypted credentials in PasswordAuthenticator (CASSANDRA-7715)
+ * fix SASI memtable switching on flush (CASSANDRA-11159)
+ * Remove duplicate offline compaction tracking (CASSANDRA-11148)
+ * fix EQ semantics of analyzed SASI indexes (CASSANDRA-11130)
+ * Support long name output for nodetool commands (CASSANDRA-7950)
+ * Encrypted hints (CASSANDRA-11040)
+ * SASI index options validation (CASSANDRA-11136)
+ * Optimize disk seek using min/max column name meta data when the LIMIT clause is used
+ (CASSANDRA-8180)
+ * Add LIKE support to CQL3 (CASSANDRA-11067)
+ * Generic Java UDF types (CASSANDRA-10819)
+ * cqlsh: Include sub-second precision in timestamps by default (CASSANDRA-10428)
+ * Set javac encoding to utf-8 (CASSANDRA-11077)
+ * Integrate SASI index into Cassandra (CASSANDRA-10661)
+ * Add --skip-flush option to nodetool snapshot
+ * Skip values for non-queried columns (CASSANDRA-10657)
+ * Add support for secondary indexes on static columns (CASSANDRA-8103)
+ * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051)
+ * Add metric for number of dropped mutations (CASSANDRA-10866)
+ * Simplify row cache invalidation code (CASSANDRA-10396)
+ * Support user-defined compaction through nodetool (CASSANDRA-10660)
+ * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981)
+ * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953)
+ * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838)
+Merged from 3.0:
- =======
- 3.0.4
* Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
* Add query time validation method on Index (CASSANDRA-11043)
* Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)