[beam] branch master updated (e8abafe -> 7664965)

[ja...@apache.org]

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

jaku pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git.


    from e8abafe  Merge pull request #6121: [BEAM-5067] Switching to correct datastore proto package
     add 51d79ad  [BEAM-4804] Use beam-perf label for local perf tests
     new 7664965  Merge pull request #6136: [BEAM-4804] Use beam-perf label for local perf tests

The 1 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:
 .test-infra/jenkins/CommonJobProperties.groovy               | 12 +++++++++---
 .../jenkins/job_PostCommit_Java_Nexmark_Direct.groovy        |  2 +-
 .test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy |  2 +-
 .test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

[beam] 01/01: Merge pull request #6136: [BEAM-4804] Use beam-perf label for local perf tests

[ja...@apache.org]

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

jaku pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git

commit 7664965ffc029133aa3079fdb7ae5029aaf32eba
Merge: e8abafe 51d79ad
Author: jasonkuster <ja...@google.com>
AuthorDate: Fri Aug 3 12:31:27 2018 -0700

    Merge pull request #6136: [BEAM-4804] Use beam-perf label for local perf tests
    
    [BEAM-4804] Use beam-perf label for local perf tests

 .test-infra/jenkins/CommonJobProperties.groovy               | 12 +++++++++---
 .../jenkins/job_PostCommit_Java_Nexmark_Direct.groovy        |  2 +-
 .test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy |  2 +-
 .test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)