You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2020/06/10 10:31:49 UTC

[flink] branch release-1.11 updated (d36a2b3 -> e444d1f)

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

chesnay pushed a change to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git.


    from d36a2b3  [FLINK-17944][sql-client] Wrong output in SQL Client's table mode
     new cafe5e6e [FLINK-18018][dist] Bundle GPU plugin in plugins/ directory
     new e444d1f  [FLINK-18215][conf] Add log level to JavaBashUtils log4j config

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 flink-dist/src/main/assemblies/opt.xml             | 22 ----------------------
 flink-dist/src/main/assemblies/plugins.xml         | 22 ++++++++++++++++++++++
 .../src/main/resources/log4j-bash-utils.properties |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)


[flink] 02/02: [FLINK-18215][conf] Add log level to JavaBashUtils log4j config

Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git

commit e444d1ff87148cc75231c79b6de39543844f6af8
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Jun 9 15:35:12 2020 +0200

    [FLINK-18215][conf] Add log level to JavaBashUtils log4j config
---
 flink-dist/src/main/resources/log4j-bash-utils.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-dist/src/main/resources/log4j-bash-utils.properties b/flink-dist/src/main/resources/log4j-bash-utils.properties
index 3aff31b..15a6e12 100644
--- a/flink-dist/src/main/resources/log4j-bash-utils.properties
+++ b/flink-dist/src/main/resources/log4j-bash-utils.properties
@@ -23,4 +23,4 @@ rootLogger.appenderRef.console.ref = ConsoleAppender
 appender.console.name = ConsoleAppender
 appender.console.type = CONSOLE
 appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %x - %m%n
+appender.console.layout.pattern = %-5p %x - %m%n


[flink] 01/02: [FLINK-18018][dist] Bundle GPU plugin in plugins/ directory

Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git

commit cafe5e6edca1391ad126c82598a26a7a777e4200
Author: Yangze Guo <ka...@gmail.com>
AuthorDate: Tue Jun 9 21:50:46 2020 +0800

    [FLINK-18018][dist] Bundle GPU plugin in plugins/ directory
---
 flink-dist/src/main/assemblies/opt.xml     | 22 ----------------------
 flink-dist/src/main/assemblies/plugins.xml | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
index aa2327c..ed263a36 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -75,28 +75,6 @@
 			<fileMode>0644</fileMode>
 		</file>
 
-		<!-- External Resource -->
-		<file>
-			<source>../flink-external-resources/flink-external-resource-gpu/target/flink-external-resource-gpu-${project.version}.jar</source>
-			<outputDirectory>opt/external-resource-gpu/</outputDirectory>
-			<destName>flink-external-resource-gpu-${project.version}.jar</destName>
-			<fileMode>0644</fileMode>
-		</file>
-
-		<file>
-			<source>../flink-external-resources/flink-external-resource-gpu/src/main/resources/gpu-discovery-common.sh</source>
-			<outputDirectory>opt/external-resource-gpu/</outputDirectory>
-			<destName>gpu-discovery-common.sh</destName>
-			<fileMode>0755</fileMode>
-		</file>
-
-		<file>
-			<source>../flink-external-resources/flink-external-resource-gpu/src/main/resources/nvidia-gpu-discovery.sh</source>
-			<outputDirectory>opt/external-resource-gpu/</outputDirectory>
-			<destName>nvidia-gpu-discovery.sh</destName>
-			<fileMode>0755</fileMode>
-		</file>
-
 		<file>
 			<source>../flink-filesystems/flink-s3-fs-hadoop/target/flink-s3-fs-hadoop-${project.version}.jar</source>
 			<outputDirectory>opt/</outputDirectory>
diff --git a/flink-dist/src/main/assemblies/plugins.xml b/flink-dist/src/main/assemblies/plugins.xml
index e2824c4..b6008fe 100644
--- a/flink-dist/src/main/assemblies/plugins.xml
+++ b/flink-dist/src/main/assemblies/plugins.xml
@@ -79,6 +79,28 @@
 			<destName>flink-metrics-slf4j-${project.version}.jar</destName>
 			<fileMode>0644</fileMode>
 		</file>
+
+		<!-- External Resource -->
+		<file>
+			<source>../flink-external-resources/flink-external-resource-gpu/target/flink-external-resource-gpu-${project.version}.jar</source>
+			<outputDirectory>plugins/external_resource_gpu/</outputDirectory>
+			<destName>flink-external-resource-gpu-${project.version}.jar</destName>
+			<fileMode>0644</fileMode>
+		</file>
+
+		<file>
+			<source>../flink-external-resources/flink-external-resource-gpu/src/main/resources/gpu-discovery-common.sh</source>
+			<outputDirectory>plugins/external_resource_gpu/</outputDirectory>
+			<destName>gpu-discovery-common.sh</destName>
+			<fileMode>0755</fileMode>
+		</file>
+
+		<file>
+			<source>../flink-external-resources/flink-external-resource-gpu/src/main/resources/nvidia-gpu-discovery.sh</source>
+			<outputDirectory>plugins/external_resource_gpu/</outputDirectory>
+			<destName>nvidia-gpu-discovery.sh</destName>
+			<fileMode>0755</fileMode>
+		</file>
 	</files>
 
 </assembly>