diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 7853df8..d10eeaa 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -21,8 +21,8 @@ pipeline { } triggers { issueCommentTrigger("${obltGitHubComments()}") - // Only master branch will run on a timer basis - cron(env.BRANCH_NAME == 'master' ? '@daily' : '') + // Only main branch will run on a timer basis + cron(env.BRANCH_NAME == 'main' ? '@daily' : '') } stages { stage('Checkout') { diff --git a/CHANGELOG.md b/CHANGELOG.md index bb534bf..2d64b79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,7 @@ ## 0.6.0 (2021-01-21) -* Add validation against the ecs-logging [spec](https://github.com/elastic/ecs-logging/blob/master/spec/spec.json) ([#31](https://github.com/elastic/ecs-logging-python/pull/31)) +* Add validation against the ecs-logging [spec](https://github.com/elastic/ecs-logging/blob/main/spec/spec.json) ([#31](https://github.com/elastic/ecs-logging-python/pull/31)) * Add support for `service.name` from APM log correlation ([#32](https://github.com/elastic/ecs-logging-python/pull/32)) * Correctly order `@timestamp`, `log.level`, and `message` fields ([#28](https://github.com/elastic/ecs-logging-python/pull/28)) diff --git a/README.md b/README.md index ec4add1..a53e02c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ecs-logging-python -[![Build Status](https://apm-ci.elastic.co/job/apm-agent-python/job/ecs-logging-python-mbp/job/master/badge/icon)](https://apm-ci.elastic.co/blue/organizations/jenkins/apm-agent-python%2Fecs-logging-python-mbp/branches) +[![Build Status](https://apm-ci.elastic.co/job/apm-agent-python/job/ecs-logging-python-mbp/job/main/badge/icon)](https://apm-ci.elastic.co/blue/organizations/jenkins/apm-agent-python%2Fecs-logging-python-mbp/branches) [![PyPI](https://img.shields.io/pypi/v/ecs-logging)](https://pypi.org/project/ecs-logging) [![Versions Supported](https://img.shields.io/pypi/pyversions/ecs-logging)](https://pypi.org/project/ecs-logging) diff --git a/pyproject.toml b/pyproject.toml index edbabc5..4dd2450 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,4 +42,4 @@ develop = [ "Download" = "https://github.com/elastic/ecs-logging-python/releases" "Documentation" = "https://github.com/elastic/ecs-logging-python" "Issue Tracker" = "https://github.com/elastic/ecs-logging-python/issues" -"Changelog" = "https://github.com/elastic/ecs-logging-python/blob/master/CHANGELOG.md" +"Changelog" = "https://github.com/elastic/ecs-logging-python/blob/main/CHANGELOG.md"