splunk / eventgen

Splunk Event Generator: Eventgen
Apache License 2.0
380 stars 179 forks source link

merge develop to master after 7.1.0 release #376

Closed GordonWang closed 4 years ago

GordonWang commented 4 years ago

I found out there are some PRs in 7.1.0 squash merge in master branch. These PRs were already included in 7.0.0 release. for example

* Fix structlog dependency for app (#281 )
* zipfile fix (#284)

The squash commit is 873c615

To make sure these PRs are not included in future releases, we need to merge develop branch to master branch.

Do make sure this PR is not squashed merge. This must create a merge commit in develop branch. So, choose Create a merge commit instead of Squash and merge

In the future, the release branch to develop branch PR and release branch to master branch PR can not be merged with squash merge, they must have merge commit.