search

splunk / eventgen

Splunk Event Generator: Eventgen
Apache License 2.0
376 stars 180 forks source link

Merge master branch 7.1.0 release back to develop branch #375

Closed GordonWang closed 4 years ago

GordonWang commented 4 years ago

I found out there are some PRs in 7.1.0 squash merge. 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 https://github.com/splunk/eventgen/commit/873c615ef3c7f8caf2df845d195f7718496f39b1

To make sure these PRs are not included in future releases, we need to have this PR to merge master back to develop.

GordonWang commented 4 years ago

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

GordonWang commented 4 years ago

close this PR due to wrong base branch and compare branch.

Created the right PR https://github.com/splunk/eventgen/pull/376