Skip to content

Conversation

@beniwohli
Copy link
Contributor

The master branch will see some incompatibilities landed between
now and 6.2 (when APM goes GA). This should avoid that those
incompatibilities land on
https://www.elastic.co/guide/en/apm/agent/python/current/index.html
before GA.

@beniwohli
Copy link
Contributor Author

Just saw an email from @drewr regarding slashes in branch names. Could this be a problem here?

@beniwohli
Copy link
Contributor Author

I renamed the branch from releases/1.x to 1.x now.

@beniwohli beniwohli changed the title set current branch of apm-agent-python to releases/1.x set current branch of apm-agent-python to "1.x" Dec 18, 2017
@debadair
Copy link
Contributor

As a general rule, we've gone to publishing docs for upcoming releases in addition to the "current" release. I'd switch this to:

current:    1.x
branches:   [ master, 2.x, 1.x ]

Either way, as long as it builds locally with your changes, LGTM.

@beniwohli
Copy link
Contributor Author

Sounds good, thanks! I'll try and build it with all three branches locally, and merge if it works as expected

The master branch will see some incompatibilities landed between
now and 6.2 (when APM goes GA). This should avoid that those
compatibilities land on
https://www.elastic.co/guide/en/apm/agent/python/current/index.html
before GA.
@beniwohli beniwohli merged commit 7e09d80 into elastic:master Dec 19, 2017
@beniwohli beniwohli deleted the apm-agent-current-branch branch December 19, 2017 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants