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

Posted to commits@heron.apache.org by jo...@apache.org on 2019/12/10 00:18:45 UTC

[incubator-heron] 01/02: Merge branch 'master' of github.com:apache/incubator-heron into joshfischer/apache-content

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

joshfischer pushed a commit to branch joshfischer/apache-content
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git

commit a380a581b9ca99cc8786af3149594ec2374aa3b0
Merge: 173c090 dcd1b92
Author: Josh Fischer <jo...@joshfischer.io>
AuthorDate: Mon Dec 9 18:16:40 2019 -0600

    Merge branch 'master' of github.com:apache/incubator-heron into joshfischer/apache-content

 .asf.yaml                                | 24 ++++++++++++++++++++++++
 .htaccess                                |  1 -
 website2/website/scripts/publish_site.sh |  7 ++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)