[ 
https://issues.apache.org/jira/browse/BEAM-5024?focusedWorklogId=127590&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-127590
 ]

ASF GitHub Bot logged work on BEAM-5024:
----------------------------------------

                Author: ASF GitHub Bot
            Created on: 26/Jul/18 00:00
            Start Date: 26/Jul/18 00:00
    Worklog Time Spent: 10m 
      Work Description: aaltay closed pull request #6067: [BEAM-5024] Remove 
reference to dataflow-distribution.properties
URL: https://github.com/apache/beam/pull/6067
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunnerInfo.java
 
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunnerInfo.java
index 75b07559554..9a3fa14b2f0 100644
--- 
a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunnerInfo.java
+++ 
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunnerInfo.java
@@ -34,8 +34,6 @@
 
   private static final String APACHE_BEAM_DISTRIBUTION_PROPERTIES_PATH =
       "/org/apache/beam/runners/dataflow/dataflow.properties";
-  private static final String DATAFLOW_DISTRIBUTION_PROPERTIES_PATH =
-      "/org/apache/beam/runners/dataflow/dataflow-distribution.properties";
   private static final String FNAPI_ENVIRONMENT_MAJOR_VERSION_KEY =
       "fnapi.environment.major.version";
   private static final String LEGACY_ENVIRONMENT_MAJOR_VERSION_KEY =
@@ -48,10 +46,7 @@
     static {
       Properties properties;
       try {
-        properties = load(DATAFLOW_DISTRIBUTION_PROPERTIES_PATH);
-        if (properties == null) {
-          properties = load(APACHE_BEAM_DISTRIBUTION_PROPERTIES_PATH);
-        }
+        properties = load(APACHE_BEAM_DISTRIBUTION_PROPERTIES_PATH);
         if (properties == null) {
           // Print a warning if we can not load either the Dataflow 
distribution properties
           // or the


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[email protected]


Issue Time Tracking
-------------------

    Worklog Id:     (was: 127590)
    Time Spent: 40m  (was: 0.5h)

> Deprecate Dataflow SDK Distribution
> -----------------------------------
>
>                 Key: BEAM-5024
>                 URL: https://issues.apache.org/jira/browse/BEAM-5024
>             Project: Beam
>          Issue Type: Improvement
>          Components: runner-dataflow
>            Reporter: Ahmet Altay
>            Assignee: Ahmet Altay
>            Priority: Major
>          Time Spent: 40m
>  Remaining Estimate: 0h
>
> GCP decided to deprecate Dataflow SDK distribution, in favor of Apache Beam 
> SDK distribution.
> All in Beam!



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Reply via email to