Merge 2x to master #5936

jenshnielsen · Jan 28, 2016

Yet another somewhat painful merge due to conflicts in pdf files so doing via PR

WeatherGod · Jan 28, 2016

so, most of these are already on v2.x, they just weren't marked as such? The diff seems rather paltry compared to the number of merge commits.

QuLogic · Jan 28, 2016

Presumably all those "merge" commits are just cherry-picked from master, so the merge back did nothing.

jenshnielsen · Jan 29, 2016

@QuLogic is right. The merge commits were backported and the new commits that creates will be empty when merged back to master

mdboom added the needs_review label Jan 28, 2016

QuLogic added this to the 2.1 (next point release) milestone Jan 28, 2016

WeatherGod added a commit that referenced this pull request Jan 28, 2016

WeatherGod Merge pull request #5936 from jenshnielsen/merge2xmaster
Merge 2x to master
1c5a45a

WeatherGod merged commit 1c5a45a into matplotlib:master Jan 28, 2016
2 checks passed

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

mdboom removed the needs_review label Jan 28, 2016

jenshnielsen deleted the jenshnielsen:merge2xmaster branch Feb 16, 2016

jenshnielsen restored the jenshnielsen:merge2xmaster branch Mar 19, 2016

jenshnielsen deleted the jenshnielsen:merge2xmaster branch Apr 2, 2016

jenshnielsen	`Remove reference to changelog from frontpage` Fixes link checker issue in documentation		`f24d1bd`
tacaswell	`Merge pull request #5872 from jenshnielsen/sphinx134` DOC: Fix issue with Sphinx 1.3.4 Discarded changes to .travis.yml from #5872		`b7dfa4f`
tacaswell	`Merge pull request #5878 from jenshnielsen/removechangelog` Remove reference to changelog from frontpage		`6d4edf0`
mdboom	`Merge pull request #5880 from zblz/fix-primes` mathtext: Fix bugs in conversion of apostrophes to primes	Some checks were not successful 1 errored and 2 successful checks continuous-integration/appveyor/pr — AppVeyor build cancelled Details continuous-integration/travis-ci/pr — The Travis CI build passed Details continuous-integration/travis-ci/push — The Travis CI build passed Details	`cd866e9`
jenshnielsen	`Make sure that we have at least one loc before calculating as suggest…` …ed by @mdboom		`0163652`
tacaswell	`DOC: add function name to deprecation warning`		`a11fb24`
tacaswell	`Merge pull request #5914 from dopplershift/fix-barbs` Make barbs draw correctly (Fixes #5803) Conflicts: lib/matplotlib/tests/test_quiver.py white space vs new test		`180a21c`
tacaswell	`Merge pull request #5913 from tacaswell/backport_numtick_fix` Backport part of #5906		`d39b331`
jenshnielsen	`Merge pull request #5915 from tacaswell/mnt_clarify_deprecation` DOC: add function name to deprecation warning		`dc3f061`
mdboom	`Update docstring to match kwarg default` This was missed when moving to zero-tolerance image comparisons		`c835acb`
tacaswell	`Merge pull request #5924 from mdboom/fix-image-comparison-docstring` Update docstring to match kwarg default		`1e72a2b`
WeatherGod	`Merge pull request #5910 from mdboom/image-read-from-url` Fix reading/writing from urllib.request objects This backport needed to exclude nbagg optimizations.		`0ea4ec9`
mdboom	`Merge pull request #5927 from WeatherGod/backport_5910` Merge pull request #5910 from mdboom/image-read-from-url		`99ad89d`
efiring	`Merge pull request #5620 from tacaswell/fix_quiverkey` FIX: quiver key pivot location		`9372533`
WeatherGod	`Merge pull request #5932 from jenshnielsen/quiverbackport` Backport Merge pull request #5620 from tacaswell/fix_quiverkey		`cb4e69f`
jenshnielsen	`Merge remote-tracking branch 'matplotlib/v1.5.x' into merge15xto2xcon…` …flict		`b32900d`
WeatherGod	`Merge pull request #5934 from jenshnielsen/merge15xto2xconflict` Merge 15x to 2x		`9ecd876`
jenshnielsen	`Merge remote-tracking branch 'matplotlib/v2.x'`	All checks have passed 2 successful checks continuous-integration/appveyor/pr — AppVeyor build succeeded Details continuous-integration/travis-ci/pr — The Travis CI build passed Details	`b118650`

matplotlib/matplotlib

Merge 2x to master #5936

jenshnielsen commented Jan 28, 2016

jenshnielsen and others added some commits Jan 19, 2016

mdboom added the needs_review label Jan 28, 2016

WeatherGod commented Jan 28, 2016

QuLogic added this to the 2.1 (next point release) milestone Jan 28, 2016

QuLogic commented Jan 28, 2016

WeatherGod added a commit that referenced this pull request Jan 28, 2016

WeatherGod merged commit `1c5a45a` into matplotlib:master Jan 28, 2016
2 checks passed

2 checks passed

mdboom removed the needs_review label Jan 28, 2016

jenshnielsen commented Jan 29, 2016

jenshnielsen deleted the jenshnielsen:merge2xmaster branch Feb 16, 2016

jenshnielsen restored the jenshnielsen:merge2xmaster branch Mar 19, 2016

jenshnielsen deleted the jenshnielsen:merge2xmaster branch Apr 2, 2016

matplotlib/matplotlib

Join GitHub today

Merge 2x to master #5936

Conversation

jenshnielsen commented Jan 28, 2016

jenshnielsen and others added some commits Jan 19, 2016

Some checks were not successful

All checks have passed

mdboom added the needs_review label Jan 28, 2016

WeatherGod commented Jan 28, 2016

QuLogic added this to the 2.1 (next point release) milestone Jan 28, 2016

QuLogic commented Jan 28, 2016

WeatherGod added a commit that referenced this pull request Jan 28, 2016

Hide details View details WeatherGod merged commit 1c5a45a into matplotlib:master Jan 28, 2016 2 checks passed

2 checks passed

mdboom removed the needs_review label Jan 28, 2016

jenshnielsen commented Jan 29, 2016

jenshnielsen deleted the jenshnielsen:merge2xmaster branch Feb 16, 2016

jenshnielsen restored the jenshnielsen:merge2xmaster branch Mar 19, 2016

jenshnielsen deleted the jenshnielsen:merge2xmaster branch Apr 2, 2016

WeatherGod merged commit `1c5a45a` into matplotlib:master Jan 28, 2016
2 checks passed