[flink-statefun] branch 17287 updated (6db60e5 -> dba3911)

[ch...@apache.org]

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

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


 discard 6db60e5  [FLINK-17287][github] Disable merge commit button
     new dba3911  [FLINK-17287][github] Disable merge commit button

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (6db60e5)
            \
             N -- N -- N   refs/heads/17287 (dba3911)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 tools/releasing/create_source_release.sh | 1 +
 1 file changed, 1 insertion(+)

[flink-statefun] 01/01: [FLINK-17287][github] Disable merge commit button

[ch...@apache.org]

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

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

commit dba39116aebecd0bbaaa2e9b15bc7d8e26930ec6
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Apr 21 10:11:25 2020 +0200

    [FLINK-17287][github] Disable merge commit button
---
 .asf.yaml                                | 5 +++++
 tools/releasing/create_source_release.sh | 1 +
 2 files changed, 6 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000..930c896
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,5 @@
+github:
+  enabled_merge_buttons:
+    squash: true
+    merge: false
+    rebase: true
diff --git a/tools/releasing/create_source_release.sh b/tools/releasing/create_source_release.sh
index 82a13bc..ab2ed87 100755
--- a/tools/releasing/create_source_release.sh
+++ b/tools/releasing/create_source_release.sh
@@ -71,6 +71,7 @@ git clone ${PROJECT_ROOT} ${CLONE_DIR}
 cd ${CLONE_DIR}
 rsync -a \
   --exclude ".git" --exclude ".gitignore" \
+  --exclude ".asf.yaml" \
   --exclude "target" \
   --exclude ".idea" --exclude "*.iml" \
   --exclude ".travis.yml" \