Advertisement
Guest User

Untitled

a guest
May 31st, 2017
128
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 10.97 KB | None | 0 0
  1. % git log e778cf --not origin/2.12.x --merges --first-parent
  2. commit e778cf543e80eb9a2aa297cc22cd01bd51a854de
  3. Merge: 0edda55e87 fa78b6d0e0
  4. Author: Seth Tisue <seth@tisue.net>
  5. Date: Tue May 30 11:07:46 2017 +0200
  6.  
  7. Merge pull request #5922 from retronym/merge/2.12.x-to-2.13.x-20170530
  8.  
  9. Merge 2.12.x to 2.13.x [ci: last-only]
  10.  
  11. commit 0edda55e876c5d357b81e634cae5a7825a679f2b
  12. Merge: 3856d07fc4 68bc820156
  13. Author: Lukas Rytz <lukas.rytz@gmail.com>
  14. Date: Sat May 13 13:50:46 2017 +0200
  15.  
  16. Merge pull request #5902 from adriaanm/2.13.x
  17.  
  18. Merge 2.12.x into 2.13.x [ci: last-only]
  19.  
  20. commit 3856d07fc4cf13945fecdc7e09a5a3947b20188b
  21. Merge: c1af099c05 6d43e81c86
  22. Author: Seth Tisue <seth@tisue.net>
  23. Date: Mon May 1 11:40:38 2017 -0700
  24.  
  25. Merge pull request #5878 from SethTisue/merge-2.12-to-2.13-may-1
  26.  
  27. Merge 2.12 to 2.13 [ci: last-only]
  28.  
  29. commit c1af099c05c532f260fb11c17623e9016522277d
  30. Merge: 66bd43b2a5 07091de49f
  31. Author: Seth Tisue <seth@tisue.net>
  32. Date: Thu Apr 27 16:57:41 2017 -0700
  33.  
  34. Merge pull request #5868 from lrytz/merge-2.12-to-2.13-apr-27
  35.  
  36. Merge 2.12 to 2.13
  37.  
  38. commit 66bd43b2a59fbe5aed61a5b72dda307c23333c07
  39. Merge: 483be9a038 775bb11744
  40. Author: Lukas Rytz <lukas.rytz@gmail.com>
  41. Date: Mon Apr 24 21:39:08 2017 +0200
  42.  
  43. Merge pull request #5862 from SethTisue/merge-2.12-to-2.13-apr-24
  44.  
  45. Merge 2.12.x to 2.13.x [ci: last-only]
  46.  
  47. commit 483be9a038e8aadf46eaa67c1eecf114a4d9bd35
  48. Merge: fa07f0f84e 63881c23c1
  49. Author: Lukas Rytz <lukas.rytz@gmail.com>
  50. Date: Thu Apr 20 10:51:40 2017 +0200
  51.  
  52. Merge pull request #5860 from lrytz/scalacheckUpdate
  53.  
  54. Use 2.13 binary version for scalacheck
  55.  
  56. commit fa07f0f84e34b96e9a3e5e7a9ca6ed6df98b95c1
  57. Merge: 97319fb9c6 41ef693b05
  58. Author: Lukas Rytz <lukas.rytz@gmail.com>
  59. Date: Wed Apr 19 12:10:45 2017 +0200
  60.  
  61. Merge pull request #5858 from lrytz/versionsBump13M1
  62.  
  63. Bump version numbers after 2.13.0-M1
  64.  
  65. commit 97319fb9c6d41234bc1f137563b2b74ac3ef33dc
  66. Merge: 6f0f1624d0 5a78a23179
  67. Author: Lukas Rytz <lukas.rytz@gmail.com>
  68. Date: Thu Apr 13 14:11:54 2017 +0200
  69.  
  70. Merge pull request #5850 from lrytz/merge-2.12-to-2.13-apr-13
  71.  
  72. Merge 2.12 to 2.13
  73.  
  74. commit 6f0f1624d0ac1138f8474a0aa98b88150343cf6f
  75. Merge: 012c552c79 2dd55aa1d9
  76. Author: Lukas Rytz <lukas.rytz@gmail.com>
  77. Date: Thu Apr 13 13:01:32 2017 +0200
  78.  
  79. Merge pull request #5849 from lrytz/partest-1.1.1
  80.  
  81. Use partest 1.1.1
  82.  
  83. commit 012c552c79eebf2b93b16e04b6f61764cb438089
  84. Merge: 87c8eb713c 002c07818c
  85. Author: Seth Tisue <seth@tisue.net>
  86. Date: Tue Apr 11 10:02:24 2017 -0500
  87.  
  88. Merge pull request #5843 from lrytz/merge-2.12-to-2.13-apr-11
  89.  
  90. Merge 2.12 to 2.13 [ci: last-only]
  91.  
  92. commit 87c8eb713cab73e132734849a0445f2a6315403e
  93. Merge: 3400e5365d f540fa66bb
  94. Author: Lukas Rytz <lukas.rytz@gmail.com>
  95. Date: Fri Apr 7 23:01:13 2017 +0200
  96.  
  97. Merge pull request #5830 from lrytz/cut-deps
  98.  
  99. Cut dependencies on future modules
  100.  
  101. commit b5f1d3b3e7fe335c7a3621a07f5bfb164a2f6f9f
  102. Merge: 77748fb850 f280cf3412
  103. Author: Lukas Rytz <lukas.rytz@gmail.com>
  104. Date: Fri Apr 7 11:54:44 2017 +0200
  105.  
  106. Merge pull request #5790 from SethTisue/no-more-scala-library-all
  107.  
  108. unbundle scala-library-all, scala-swing, scala-parser-combinators
  109.  
  110. commit 77748fb850400150c08ef5a3ac18f2c330127586
  111. Merge: 27a48e36e4 9cd3becde5
  112. Author: Adriaan Moors <adriaan@lightbend.com>
  113. Date: Wed Apr 5 15:52:25 2017 -0700
  114.  
  115. Merge pull request #5698 from szeiger/wip/overloaded-pf-inference
  116.  
  117. Eliminate non-matching overloads early for partial function literals
  118.  
  119. commit 27a48e36e4cf97310dd496828ae68b464ec79220
  120. Merge: f9a019c400 1bf18ec9c3
  121. Author: Seth Tisue <seth@tisue.net>
  122. Date: Mon Apr 3 21:37:22 2017 -0400
  123.  
  124. Merge pull request #5810 from lrytz/binaryVersion
  125.  
  126. Set scala.binary.version to 2.12 until 2.13.0-M1 is out
  127.  
  128. commit f9a019c400c1d1d096d2e8315fab4ac12d1ba88f
  129. Merge: 99492a2b8d dd401472fa
  130. Author: Lukas Rytz <lukas.rytz@gmail.com>
  131. Date: Tue Mar 28 11:16:02 2017 +0200
  132.  
  133. Merge pull request #5611 from fhalde/2.12.x
  134.  
  135. Common usage of finding random number in a range [ci: last-only]
  136.  
  137. commit 99492a2b8da8b56d1c1db936ef4e747460af5215
  138. Merge: a28cc92f13 e0e387d3fd
  139. Author: Lukas Rytz <lukas.rytz@gmail.com>
  140. Date: Mon Mar 27 18:37:36 2017 +0200
  141.  
  142. Merge pull request #5795 from janekdb/topic/2.13/remove-280-constant
  143.  
  144. Remove unused 2.8.0 Scala version val
  145.  
  146. commit a28cc92f139a9ee2885a75c98a59fbe93eeb1e93
  147. Merge: cd15cb8b0b aaee64edcd
  148. Author: Lukas Rytz <lukas.rytz@gmail.com>
  149. Date: Mon Mar 27 16:23:33 2017 +0200
  150.  
  151. Merge pull request #5793 from janekdb/topic/2.13/elisible-elidable
  152.  
  153. Respell elidable checking function and make more similar to namesake
  154.  
  155. commit cd15cb8b0bdf6be673da3bf0a7b3db3f0972af43
  156. Merge: 8162be2e40 1db658555b
  157. Author: Lukas Rytz <lukas.rytz@gmail.com>
  158. Date: Mon Mar 27 16:20:41 2017 +0200
  159.  
  160. Merge pull request #5788 from SethTisue/triemap-deprecations
  161.  
  162. remove/privatize deprecated stuff from collection.concurrent.TrieMap
  163.  
  164. commit 8162be2e400bcd64c9d8fa803bb9557ad4cbeb5a
  165. Merge: 26504fe7f5 75169c2033
  166. Author: Lukas Rytz <lukas.rytz@gmail.com>
  167. Date: Mon Mar 27 16:03:51 2017 +0200
  168.  
  169. Merge pull request #5644 from xuwei-k/MonadOps-value-class
  170.  
  171. Make TraversableOnce.MonadOps a value class
  172.  
  173. commit 26504fe7f5fd275eb0fa78ebe3788c4d969ce7cb
  174. Merge: e2a2cbacd0 17633b2db3
  175. Author: Lukas Rytz <lukas.rytz@gmail.com>
  176. Date: Wed Mar 22 07:05:08 2017 +0100
  177.  
  178. Merge pull request #5794 from SethTisue/merge-2.12-to-2.13-mar-21
  179.  
  180. Merge branch '2.12.x' into 2.13.x
  181.  
  182. commit e2a2cbacd01da153ad682938f6e92ee3a474aee6
  183. Merge: ef63cb91bf d205a63cd1
  184. Author: Seth Tisue <seth@tisue.net>
  185. Date: Wed Mar 15 14:22:35 2017 -0700
  186.  
  187. Merge pull request #5603 from szeiger/wip/modularize-parallel-collections
  188.  
  189. [ci:last-only] Remove parallel collections from scala-library
  190.  
  191. commit ef63cb91bf6d881bab30294edcf22af692727323
  192. Merge: 2957eae341 abd348264b
  193. Author: Lukas Rytz <lukas.rytz@gmail.com>
  194. Date: Tue Mar 14 14:48:07 2017 +0100
  195.  
  196. Merge pull request #5595 from monkey-mas/remove-unnecessary-methods-from-traversableonce
  197.  
  198. Remove unnecessary methods in TraversableOnce
  199.  
  200. commit 2957eae341630a8164b4e84bde6e71045b9e01c7
  201. Merge: 7c84248581 5f25777d11
  202. Author: Lukas Rytz <lukas.rytz@gmail.com>
  203. Date: Tue Mar 14 14:40:26 2017 +0100
  204.  
  205. Merge pull request #5358 from som-snytt/issue/9380
  206.  
  207. SI-9380 Remove Regex.unapplySeq(Any)
  208.  
  209. commit 7c84248581aabc2da7ec2d64a6a6d9f9e1b0f675
  210. Merge: 6af9749f9f 48ebed85f8
  211. Author: Lukas Rytz <lukas.rytz@gmail.com>
  212. Date: Thu Mar 9 13:23:08 2017 +0100
  213.  
  214. Merge pull request #5768 from lrytz/merge-2.12-to-2.13-mar-9
  215.  
  216. Merge 2.12 to 2.13 mar 9
  217.  
  218. commit 6af9749f9f0f4f7029404a9f764241c341820eb8
  219. Merge: 4dca85cbd4 1d02d84e98
  220. Author: Lukas Rytz <lukas.rytz@gmail.com>
  221. Date: Wed Mar 8 22:53:07 2017 +0100
  222.  
  223. Merge pull request #5763 from lrytz/merge-2.12-to-2.13-mar-8
  224.  
  225. Merge 2.12 to 2.13
  226.  
  227. commit 4dca85cbd4740907a7e902fecdd2c6b5976e1d36
  228. Merge: 9f067667b3 5095b1e32c
  229. Author: Seth Tisue <seth@tisue.net>
  230. Date: Tue Mar 7 15:41:12 2017 -0800
  231.  
  232. Merge pull request #5759 from SethTisue/merge-2.12.x-onto-2.13.x-20170306
  233.  
  234. [ci: last-only] merge 2.12.x onto 2.13.x (March 6, 2017)
  235.  
  236. commit 9f067667b32fd03c7282ce7185ef032a0e4a822e
  237. Merge: c348b7ee6a 9cd3fb60d8
  238. Author: Adriaan Moors <adriaan@lightbend.com>
  239. Date: Wed Mar 1 13:42:51 2017 -0800
  240.  
  241. Merge pull request #5751 from SethTisue/bring-back-charsequence-implicits
  242.  
  243. make Predef.*CharSequence implicits public again
  244.  
  245. commit c348b7ee6a4e9acbcb833b273d40c46364a08645
  246. Merge: 6ebf414056 e9eb568ae8
  247. Author: Lukas Rytz <lukas.rytz@gmail.com>
  248. Date: Fri Feb 24 08:07:12 2017 +0100
  249.  
  250. Merge pull request #5738 from SethTisue/sd-315
  251.  
  252. don't use Console.setOut: was deprecated, now deleted
  253.  
  254. commit 6ebf4140561e2564ec7ed30c3f6d9a2dea92be01
  255. Merge: 20a98cd89b 64e5242e13
  256. Author: Lukas Rytz <lukas.rytz@gmail.com>
  257. Date: Tue Feb 21 10:21:22 2017 +0100
  258.  
  259. Merge pull request #5720 from sjrd/remove-rbtree-iterator-recovery-mechanism
  260.  
  261. Remove the error recovery mechanism in RedBlackTree.TreeIterator.
  262.  
  263. commit 20a98cd89b30a237905f0d34b795c3add9f02c21
  264. Merge: 9b2a1c48d7 456620aec5
  265. Author: Seth Tisue <seth@tisue.net>
  266. Date: Sat Feb 18 08:11:52 2017 -0800
  267.  
  268. Merge pull request #5718 from SethTisue/merge-2.12.x-onto-2.13.x-20170217
  269.  
  270. [ci: last-only] merge 2.12.x onto 2.13.x (Feb 17, 2017)
  271.  
  272. commit 9b2a1c48d786747f72f554bc43064ba7b7c7a453
  273. Merge: b59a72f3a8 014b104e3c
  274. Author: Lukas Rytz <lukas.rytz@gmail.com>
  275. Date: Fri Feb 17 11:50:20 2017 +0100
  276.  
  277. Merge pull request #5703 from janekdb/topic/2.13/fix-names-reduce-scope
  278.  
  279. Reduce scope of val and improve some names
  280.  
  281. commit b59a72f3a879b2edcc1709eaba3733906930b645
  282. Merge: 5b9ed7506e c057e9eef2
  283. Author: Adriaan Moors <adriaan@lightbend.com>
  284. Date: Mon Feb 13 16:27:31 2017 -0800
  285.  
  286. Merge pull request #5683 from SethTisue/remove-deprecated-predef-stuff
  287.  
  288. remove deprecated stuff from Predef, scala._, scala.runtime
  289.  
  290. commit 5b9ed7506e6b8d1a30c0dc2020c06afb77e4feec
  291. Merge: d56d66d9f0 7e49927ca8
  292. Author: Seth Tisue <seth@tisue.net>
  293. Date: Fri Feb 10 16:46:19 2017 -0800
  294.  
  295. Merge pull request #5638 from som-snytt/issue/10137
  296.  
  297. SI-10137 Correct Queue.enqueue(collection.Iterable)
  298.  
  299. commit d56d66d9f0cdb7a7241d0f876aba2786cd18d1f5
  300. Merge: 2493d8c4f0 27dc56e651
  301. Author: Lukas Rytz <lukas.rytz@gmail.com>
  302. Date: Tue Dec 13 12:39:02 2016 +0100
  303.  
  304. Merge pull request #5599 from lrytz/pr5342
  305.  
  306. Make SearchImpl a value class to improve performance
  307.  
  308. commit 2493d8c4f0866aa87e0837c4ed4e1670e1f2783b
  309. Merge: 8066246f15 50148dbe87
  310. Author: Lukas Rytz <lukas.rytz@gmail.com>
  311. Date: Tue Dec 13 09:48:41 2016 +0100
  312.  
  313. Merge pull request #5548 from janekdb/issue/SI-9813-to-2.13.x
  314.  
  315. SI-9813: Add Java 1.6. and 1.8 java.lang.Math methods into scala.math.package
  316.  
  317. commit 36d6e48da258648413e50e5a9d46c94cfc062634
  318. Merge: 87c75a7b73 7083c5737f
  319. Author: Lukas Rytz <lukas.rytz@gmail.com>
  320. Date: Mon Dec 12 09:51:20 2016 +0100
  321.  
  322. Merge pull request #5591 from xuwei-k/stableSort-ClassTag
  323.  
  324. remove unnecessary ClassTag in Sorting.stableSort
  325.  
  326. commit 87c75a7b73898fa434128acfff2815e8ecce642d
  327. Merge: 92b695c46b 5e62f13716
  328. Author: Seth Tisue <seth@tisue.net>
  329. Date: Fri Dec 9 12:21:23 2016 -0800
  330.  
  331. Merge pull request #5581 from SethTisue/twelve-going-on-thirteen
  332.  
  333. 2.12 -> 2.13 in the most important places
  334.  
  335. commit 92b695c46b65360afb764f4a4720b0c8a69ff3de
  336. Merge: 208faa70c8 0394cf6455
  337. Author: Seth Tisue <seth@tisue.net>
  338. Date: Tue Dec 6 11:20:15 2016 -0800
  339.  
  340. Merge pull request #5582 from SethTisue/keep-2.13-spec-separate
  341.  
  342. in spec generation, 2.12 -> 2.13 so we don't collide
  343.  
  344. commit 208faa70c86e55a3ad36bcdb4f70415968a7fd96
  345. Merge: fc1aea6712 af0f3a90e6
  346. Author: Jason Zaugg <jzaugg@gmail.com>
  347. Date: Mon Dec 5 09:40:19 2016 +1000
  348.  
  349. Merge pull request #5578 from SethTisue/disable-mima-2.13
  350.  
  351. disable MiMa for now for 2.13
  352.  
  353. commit fc1aea671206ee9a7887de19b80874afe82e18cd
  354. Merge: 10c609e750 d271357906
  355. Author: Adriaan Moors <adriaan@lightbend.com>
  356. Date: Fri Dec 2 18:28:15 2016 -0800
  357.  
  358. Merge pull request #5568 from retronym/merge/2.12.x-to-2.13.x-20161130
  359.  
  360. Merge 2.12.x to 2.13.x [ci: last-only]
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement