Skip to content

Commit 0eaa44a

Browse files
authored
update CHANGELOG and bump version to 6.17.0 (#1868)
* Update CONTRIBUTING with Github Actions release instructions * update CHANGELOG and bump version to 6.17.0
1 parent 292588c commit 0eaa44a

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

CHANGELOG.asciidoc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,22 @@ endif::[]
2929
//===== Bug fixes
3030
//
3131
32-
=== Unreleased
3332
34-
// Unreleased changes go here
35-
// When the next release happens, nest these changes under the "Python Agent version 6.x" heading
33+
[[release-notes-6.x]]
34+
=== Python Agent version 6.x
35+
36+
[[release-notes-6.17.0]]
37+
==== 6.17.0 - 2023-07-03
38+
3639
[float]
3740
==== Features
38-
* Add `server_ca_cert_file` option to provide custom CA certificate {pull}1852[#1852]
41+
* Add `server_ca_cert_file` option to provide custom CA certificate {pull}1852[#1852]
42+
* Add `include_process_args` option to allow users to opt-in to collecting process args {pull}1867[#1867]
3943
4044
[float]
4145
===== Bug fixes
4246
* Fix a bug in the GRPC instrumentation when reaching the maximum amount of spans per transaction {pull}1861[#1861]
4347
44-
[[release-notes-6.x]]
45-
=== Python Agent version 6.x
46-
4748
[[release-notes-6.16.2]]
4849
==== 6.16.2 - 2023-06-12
4950

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,6 @@ If you have commit access, the process is as follows:
189189
1. Reset the current major branch (`1.x`, `2.x` etc) to point to the current main, e.g. `git branch -f 1.x main`
190190
1. Push tag upstream with `git push upstream --tags` (and optionally to your own fork as well)
191191
1. Update major branch, e.g. `1.x` on upstream with `git push upstream 1.x`
192-
1. After tests pass, Jenkins will automatically build a source package, as well as binary wheels.
193-
1. Create a [Github release](https://github.com/elastic/apm-agent-python/releases)
194-
targeting the new tag. Copy the changelog into the body of the release.
192+
1. After tests pass, Github Actions will automatically build and push the new release to PyPI.
193+
1. Edit and publish the [draft Github release](https://github.com/elastic/apm-agent-python/releases)
194+
created by Github Actions. Copy the changelog into the body of the release.

elasticapm/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2929
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030

31-
__version__ = (6, 16, 2)
31+
__version__ = (6, 17, 0)
3232
VERSION = ".".join(map(str, __version__))

0 commit comments

Comments
 (0)