Merge branch 'master' of http://gogsb.soaringnova.com/ylproj/livy

docker/prod/conf/livy.conf

@@ -179,7 +179,7 @@ livy.server.yarn.app-lookup-timeout = 5m
 # livy.server.auth.kerberos.principal = <spnego principal>
 # livy.server.auth.kerberos.keytab = <spnego keytab>
 # livy.server.auth.kerberos.name-rules = DEFAULT
-livy.server.launch.kerberos.principal = ailab
+livy.server.launch.kerberos.principal = ylaiuser
 livy.server.launch.kerberos.keytab = /opt/cluster/conf/user.keytab
 #
 # If user wants to use custom authentication filter, configurations are:

docker/prod/conf/log4j.properties

@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO,console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.target=System.err
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n