From d629a58045c764bc0bd6ce1d28a47e4e46fa13fc Mon Sep 17 00:00:00 2001
From: Joaquin Casares <joaquin@thelastpickle.com>
Date: Fri, 1 Jun 2018 18:47:32 -0500
Subject: [PATCH] Unset GREP_OPTIONS

Patch by Joaquin Casares; Reviewed by Jon Haddad for CASSANDRA-14487
---
 CHANGES.txt   | 1 +
 bin/cassandra | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 537c7063cd..7c3dd9474e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0-alpha4
+ * Unset GREP_OPTIONS (CASSANDRA-14487)
  * Added streaming documentation (CASSANDRA-15477)
  * Update to Python driver 3.21 for cqlsh (CASSANDRA-14872)
  * Added bulk loading documentation (CASSANDRA-15480)
diff --git a/bin/cassandra b/bin/cassandra
index de72d11c63..4341b37898 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -66,6 +66,12 @@
 # NB: Developers should be aware that this script should remain compatible with
 # POSIX sh and Solaris sh. This means, in particular, no $(( )) and no $( ).
 
+# Unset any grep options that may include `--color=always` per say.
+# Using `unset GREP_OPTIONS` will also work on the non-deprecated use case
+# of setting a new grep alias.
+# See CASSANDRA-14487 for more details.
+unset GREP_OPTIONS
+
 # If an include wasn't specified in the environment, then search for one...
 
 jvmoptions_variant="-server"