Skip to content

Please merge revision 17b1e30d045c4bbf2b156b66a973e0fdaba136f0 into dev channel #29249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jcollins-g opened this issue Apr 4, 2017 · 4 comments
Assignees
Labels
area-pkg Used for miscellaneous pkg/ packages not associated with specific area- teams. merge-to-dev
Milestone

Comments

@jcollins-g
Copy link
Contributor

jcollins-g commented Apr 4, 2017

@whesse @mit-mit @kasperl
<Fill in the labels for Milestone and Area to indicate what the merge applies to. E.g. if you're requesting a merge to fix an issue in Dart2JS, set the area to Area-Dart2JS. If this is a request to merge to stable please change the MergeToDev label to MergeToStable>

<Describe the problem this merge is fixing - include issue numbers if applicable>
This makes the dartdoc that supports generic-feature-types link in with the SDK. #27527, dart-lang/dartdoc#1321

<What revision(s) needs to be merged - please annotate revisions with reason if more than one>
17b1e30

<Please try out the merge yourself. If there are merge conflicts please resolve these and upload the cl to rietveld and provide a link here>
This merged cleanly, tested that dartdoc was able to generate SDK and a package dartdoc.

@jcollins-g jcollins-g added area-pkg Used for miscellaneous pkg/ packages not associated with specific area- teams. merge-to-dev labels Apr 4, 2017
@jcollins-g jcollins-g added this to the 1.23 milestone Apr 4, 2017
@jcollins-g jcollins-g changed the title Please merge revision 8ad1fe9b5cdf4945b80da732c228b801cc70664b into dev channel Please merge revision 17b1e30d045c4bbf2b156b66a973e0fdaba136f0 into dev channel Apr 4, 2017
@jcollins-g
Copy link
Contributor Author

Corrected with the right revision.

@whesse
Copy link
Contributor

whesse commented Apr 4, 2017

This will go in the next cherry-pick, which probably won't be for about 18 hours. Is this key to the work on landing in google3? Or can it wait to see if more cherry-pick requests arrive today?

@jcollins-g
Copy link
Contributor Author

It can likely wait; this isn't a google3 blocker AFAIK

@whesse
Copy link
Contributor

whesse commented Apr 5, 2017

Merged in 1.23.0-dev.11.5

@whesse whesse closed this as completed Apr 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-pkg Used for miscellaneous pkg/ packages not associated with specific area- teams. merge-to-dev
Projects
None yet
Development

No branches or pull requests

2 participants