Skip to content

Conversation

@pickles-bread-and-butter
Copy link
Contributor

This PR updates rc/2.1.0 with the latest master changes. 2.0.1 was released after the 2.1 branch was created and due to 2.1 being protected it cannot be rebased to be even with master. So I'm merging master into rc/2.1.0 to get around this and update 2.1 to be even with master.

@codecov-commenter
Copy link

codecov-commenter commented Jun 26, 2020

Codecov Report

Merging #1637 into rc/2.1.0 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           rc/2.1.0    #1637   +/-   ##
=========================================
  Coverage     35.58%   35.58%           
=========================================
  Files           344      344           
  Lines         33568    33568           
=========================================
  Hits          11946    11946           
  Misses        21622    21622           
Impacted Files Coverage Δ
allensdk/__init__.py 68.96% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ac3b2e1...93bcc49. Read the comment docs.

@njmei njmei self-requested a review June 29, 2020 20:11
@pickles-bread-and-butter pickles-bread-and-butter merged commit 5296325 into rc/2.1.0 Jun 30, 2020
@kschelonka kschelonka deleted the update_rc_2_1 branch October 2, 2020 16:56
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.

4 participants