Merge branch 'cassandra-2.2' into cassandra-3.0

cmcconomy · Feb 18, 2016 · 6503335 · 6503335
2 parents 9b5df24 + 4985fcc
commit 6503335
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -13,6 +13,7 @@
  * 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)

diff --git 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" "$@"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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" "$@"