Skip to content

Merge/2.10 to 2.11 apr 1#4423

Merged
lrytz merged 9 commits intoscala:2.11.xfrom
lrytz:merge/2.10-to-2.11-apr-1
Apr 1, 2015
Merged

Merge/2.10 to 2.11 apr 1#4423
lrytz merged 9 commits intoscala:2.11.xfrom
lrytz:merge/2.10-to-2.11-apr-1

Conversation

@lrytz
Copy link
Member

@lrytz lrytz commented Apr 1, 2015

The diff is zero, everything was merged with -s ours. None of the patches should be in the 2.11.x tree.

Full log:

lucmac:scala luc$ git log --pretty=oneline --decorate --abbrev-commit -n 1
a49ac23 (HEAD, upstream/2.11.x, origin/2.11.x, merge/2.10-to-2.11-apr-1, 2.11.x) Merge pull request #4422 from lrytz/t8940-2.11

lucmac:scala luc$ git checkout -b merge/2.10-to-2.11-apr-1

lucmac:scala luc$ export MB=$(git merge-base head origin/2.10.x)

lucmac:scala luc$ git log --graph --oneline --decorate $MB..origin/2.10.x
*   e02a2da (upstream/2.10.x, upstream-writable/2.10.x, origin/2.10.x, 2.10.x) Merge pull request #4417 from retronym/backport/flaky
|\  
| * 5d5de4d (retronym/backport/flaky) [backport] SI-8689 Make a Future test case determistic
|/  
* 8859afb Fix link...
* a5770ac 2.10.5  is it for 2.10.x
*   88c5407 (tag: v2.10.5) Merge pull request #4365 from adriaanm/2.10.x
|\  
| * 3285445 Publish to sonatype staging.
|/  
* 8f0819a Merge pull request #4359 from adriaanm/2.10.x
* 132d99f Port old 2.10 release script to new CI.

lucmac:scala luc$ git merge 2.10.x -s ours
Merge made by the 'ours' strategy.

lucmac:scala luc$ git diff 2.11.x 
lucmac:scala luc$ 

adriaanm and others added 9 commits February 24, 2015 16:22
To fit in with the new flow, we upload to S3 instead of
using the copy artifact plugin.
Port old 2.10 release script to new CI.
Simplified while I was at it.
Publish to sonatype staging (the default).
As discussed:

  https://groups.google.com/forum/#!topic/scala-internals/m8I_3GQR4vQ

We need to ensure a happens-before relationship between the callback
that prints "success" and the end of the main method.
[backport] SI-8689 Make a Future test case determistic
@scala-jenkins scala-jenkins added this to the 2.11.7 milestone Apr 1, 2015
@retronym
Copy link
Member

retronym commented Apr 1, 2015

LGTM. If only all PRs were this easy to review!

lrytz added a commit that referenced this pull request Apr 1, 2015
@lrytz lrytz merged commit 347c475 into scala:2.11.x Apr 1, 2015
@lrytz lrytz deleted the merge/2.10-to-2.11-apr-1 branch April 10, 2015 10:11
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.

5 participants