Skip to content
This repository was archived by the owner on May 23, 2023. It is now read-only.

0.31.0 master merged#235

Merged
carlosalberto merged 7 commits intoopentracing:v0.31.0from
carlosalberto:0.31.0-master-merged
Dec 18, 2017
Merged

0.31.0 master merged#235
carlosalberto merged 7 commits intoopentracing:v0.31.0from
carlosalberto:0.31.0-master-merged

Conversation

@carlosalberto
Copy link
Copy Markdown
Collaborator

In order to prepare to roll out the second (and final) Release Candidate for the 0.31 artifact, I've merged master.

This will mean that not only a few improvements done on top of the Scope concept will be rolled for RC2, but also fixes or adjustments like the usage of TextMap as default propagator for MockTracer.

Merging master didn't happen cleanly, but fortunately only minor adjustments were needed.

We will be rolling this final RC from the v0.31 branch, and we will hopefully release the final 0.31 artifact from master ;)

mcumings and others added 7 commits October 2, 2017 17:05
- Propagate @deprecated annotation to implementations
- Remove redundant "static final" definition from interface
- Use Collections.emptyMap instead of Collections.EMPTY_MAP to preserve type
…pentracing#226)

* Make ChildOf not fail if there is a null argument passed

* Moved tracer test to where it belongs. Fixed typo.
@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage increased (+1.0%) to 81.842% when pulling 012f965 on carlosalberto:0.31.0-master-merged into 39036f9 on opentracing:v0.31.0.

@carlosalberto carlosalberto merged commit ce15269 into opentracing:v0.31.0 Dec 18, 2017
@carlosalberto
Copy link
Copy Markdown
Collaborator Author

Reminder to check/review stuff if/as needed ;) @yurishkuro @pavolloffay @malafeev

@yurishkuro
Copy link
Copy Markdown
Member

lgtm

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants