You are viewing a plain text version of this content. The canonical link for it is here.

Posted to devnull@infra.apache.org by vl...@apache.org on 2019/06/08 18:42:48 UTC

[jmeter] 44/47: Needs blank line at end to prevent changes when fixcfrlf is run

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to annotated tag v2_3
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 842ddd08967164f6c6b2e9bb5545cae95c29cd88
Author: Sebastian Bazley <se...@apache.org>
AuthorDate: Mon Sep 24 22:29:27 2007 +0000

    Needs blank line at end to prevent changes when fixcfrlf is run
    
    git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@579000 13f79535-47bb-0310-9956-ffa450edef68
    
    Former-commit-id: 881a606a1daa057f15c2056e869657ee027de0df
---
 bin/jmeter-server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/jmeter-server b/bin/jmeter-server
index 46d5bd5..4a89b85 100755
--- a/bin/jmeter-server
+++ b/bin/jmeter-server
@@ -32,4 +32,4 @@ trap "kill $!" 2
 # One way to fix this is to define RMI_HOST_DEF below
 #RMI_HOST_DEF=-Djava.rmi.server.hostname=xxx.xxx.xxx.xxx
 
-${DIRNAME}/jmeter -Dserver_port=${SERVER_PORT:-1099} $RMI_HOST_DEF -s -j jmeter-server.log "$@"
\ No newline at end of file
+${DIRNAME}/jmeter -Dserver_port=${SERVER_PORT:-1099} $RMI_HOST_DEF -s -j jmeter-server.log "$@"