diff --git a/.github/workflows/ci-notification.yml b/.github/workflows/ci-notification.yml index 68cf24b47a..429965112f 100644 --- a/.github/workflows/ci-notification.yml +++ b/.github/workflows/ci-notification.yml @@ -11,6 +11,7 @@ jobs: uses: zeek/ci-email-action@master env: CI_APP_NAME: "Cirrus CI" + BRANCH_WHITELIST: "master|release/.*" SMTP_HOST: ${{ secrets.SMTP_HOST }} SMTP_PORT: ${{ secrets.SMTP_PORT }} SMTP_USER: ${{ secrets.SMTP_USER }} diff --git a/CHANGES b/CHANGES index 76c8918b58..30f7f0cebf 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +3.2.0-dev.231 | 2020-03-13 13:41:23 -0700 + + * Add branch whitelist for CI notifications (Jon Siwek, Corelight) + 3.2.0-dev.230 | 2020-03-12 13:33:09 -0700 * Introduce X509 certificate caching. diff --git a/VERSION b/VERSION index f57d506fb8..926f37a50b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.0-dev.230 +3.2.0-dev.231 diff --git a/aux/broker b/aux/broker index e02a701d76..84bb886da1 160000 --- a/aux/broker +++ b/aux/broker @@ -1 +1 @@ -Subproject commit e02a701d76f8f582ba4ac09164b795baabdb8e09 +Subproject commit 84bb886da10dbdb1c36d5c7aadcd9a4145ed141d