diff --git a/CHANGES.txt b/CHANGES.txt index 075d44a311..ae6460e41c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,6 @@ +3.10 + * Remove pre-startup check for open JMX port (CASSANDRA-12074) + 3.9 Merged from 2.1: * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043) diff --git a/bin/cassandra b/bin/cassandra index 3206fdc524..acf87cb67d 100755 --- a/bin/cassandra +++ b/bin/cassandra @@ -273,13 +273,6 @@ if [ "x$allow_root" != "xyes" ] ; then fi fi -# see CASSANDRA-7254 -"$JAVA" -cp "$CLASSPATH" $JVM_OPTS 2>&1 | grep -q 'Error: Exception thrown by the agent : java.lang.NullPointerException' -if [ $? -ne "1" ]; then - echo Unable to bind JMX, is Cassandra already running? - exit 1; -fi - # Start up the service launch_service "$pidfile" "$foreground" "$properties" "$classname"