Sat, 17 Jun 2017 08:03:09 +0100 Merge
alanb [Sat, 17 Jun 2017 08:03:09 +0100] rev 45629
Merge
Fri, 16 Jun 2017 09:20:23 -0700 8181087: Module system implementation refresh (6/2017)
alanb [Fri, 16 Jun 2017 09:20:23 -0700] rev 45628
8181087: Module system implementation refresh (6/2017) Reviewed-by: sspitsyn, hseigel
Fri, 16 Jun 2017 22:10:34 +0000 8178536: OOM ERRORS + SERVICE-THREAD TAKES A PROCESSOR TO 100%
poonam [Fri, 16 Jun 2017 22:10:34 +0000] rev 45627
8178536: OOM ERRORS + SERVICE-THREAD TAKES A PROCESSOR TO 100% Summary: Clear the pending OOM exception in SensorInfo::trigger() Reviewed-by: mchung, dcubed
Fri, 16 Jun 2017 12:18:46 -0700 8182310: [AOT][JVMCI] Get host class of VM anonymous class
dnsimon [Fri, 16 Jun 2017 12:18:46 -0700] rev 45626
8182310: [AOT][JVMCI] Get host class of VM anonymous class Summary: Add missing JVMCI functionality Reviewed-by: dlong, kvn
Thu, 15 Jun 2017 17:43:56 +0000 Merge
lana [Thu, 15 Jun 2017 17:43:56 +0000] rev 45625
Merge
Tue, 13 Jun 2017 23:22:58 +0000 Merge
sspitsyn [Tue, 13 Jun 2017 23:22:58 +0000] rev 45624
Merge
Tue, 13 Jun 2017 16:19:49 -0700 8178054: [TESTBUG] Need test for JVM TI IsModifiableModule
sspitsyn [Tue, 13 Jun 2017 16:19:49 -0700] rev 45623
8178054: [TESTBUG] Need test for JVM TI IsModifiableModule Summary: Add new test hotspot/test/serviceability/jvmti/GetNamedModule Reviewed-by: alanb, iignatyev
Tue, 13 Jun 2017 10:27:42 -0700 8181757: NonNMethod heap in segmented CodeCache is not scanned in some cases
dlong [Tue, 13 Jun 2017 10:27:42 -0700] rev 45622
8181757: NonNMethod heap in segmented CodeCache is not scanned in some cases 8171365: nsk/jvmti/scenarios/events/EM04/em04t001: many errors for missed events Reviewed-by: thartmann, kvn
Fri, 02 Jun 2017 11:26:36 +0200 8180197: Failing assert: id must be initialized
rbackman [Fri, 02 Jun 2017 11:26:36 +0200] rev 45621
8180197: Failing assert: id must be initialized Reviewed-by: kvn, kbarrett
Sat, 10 Jun 2017 16:01:29 +0800 8181906: AArch64: port bugfix for 7009641 to AArch64
fyang [Sat, 10 Jun 2017 16:01:29 +0800] rev 45620
8181906: AArch64: port bugfix for 7009641 to AArch64 Summary: Allocation in the code cache returns NULL instead of failing the entire VM Reviewed-by: aph Contributed-by: teng.lu@linaro.org
Thu, 24 Aug 2017 16:22:48 +0200 Merge
duke [Thu, 24 Aug 2017 16:22:48 +0200] rev 45619
Merge
Tue, 20 Jun 2017 13:12:42 +0200 8179537: Update testing.md for more clarity regarding JTReg configuration
ihse [Tue, 20 Jun 2017 13:12:42 +0200] rev 45618
8179537: Update testing.md for more clarity regarding JTReg configuration Reviewed-by: erikj
Mon, 19 Jun 2017 12:25:37 -0700 8182492: docs bundle needs legal notices for 3rd party libraries distributed for javadoc search
mchung [Mon, 19 Jun 2017 12:25:37 -0700] rev 45617
8182492: docs bundle needs legal notices for 3rd party libraries distributed for javadoc search Reviewed-by: jjg
Mon, 19 Jun 2017 18:20:42 +0200 8182408: Simplify the API-specification overview page
mr [Mon, 19 Jun 2017 18:20:42 +0200] rev 45616
8182408: Simplify the API-specification overview page Reviewed-by: erikj, mchung, jrose, alanb
Sat, 17 Jun 2017 08:02:30 +0100 Merge
alanb [Sat, 17 Jun 2017 08:02:30 +0100] rev 45615
Merge
Fri, 16 Jun 2017 09:20:15 -0700 8181087: Module system implementation refresh (6/2017)
alanb [Fri, 16 Jun 2017 09:20:15 -0700] rev 45614
8181087: Module system implementation refresh (6/2017) Reviewed-by: sspitsyn, hseigel
Fri, 16 Jun 2017 11:41:25 +0200 8179556: Add specs copyright file
ihse [Fri, 16 Jun 2017 11:41:25 +0200] rev 45613
8179556: Add specs copyright file Reviewed-by: erikj
Thu, 15 Jun 2017 11:54:26 -0700 8182032: Make java.compiler upgradeable
mchung [Thu, 15 Jun 2017 11:54:26 -0700] rev 45612
8182032: Make java.compiler upgradeable Reviewed-by: alanb, erikj
Thu, 15 Jun 2017 17:43:14 +0000 Merge
lana [Thu, 15 Jun 2017 17:43:14 +0000] rev 45611
Merge
Tue, 13 Jun 2017 10:44:11 -0700 8182029: Make the top-level docs index.html to a HTML-level redirect to the API overview page
mchung [Tue, 13 Jun 2017 10:44:11 -0700] rev 45610
8182029: Make the top-level docs index.html to a HTML-level redirect to the API overview page Reviewed-by: alanb, erikj, ihse
Wed, 05 Jul 2017 23:44:19 +0200 Added tag jdk-10+13 for changeset 9927a9f16738
duke [Wed, 05 Jul 2017 23:44:19 +0200] rev 45609
Added tag jdk-10+13 for changeset 9927a9f16738
Wed, 05 Jul 2017 23:44:18 +0200 Merge jdk-10+13
duke [Wed, 05 Jul 2017 23:44:18 +0200] rev 45608
Merge
Wed, 05 Jul 2017 23:44:02 +0200 Merge
duke [Wed, 05 Jul 2017 23:44:02 +0200] rev 45607
Merge
Wed, 05 Jul 2017 23:43:54 +0200 Merge
duke [Wed, 05 Jul 2017 23:43:54 +0200] rev 45606
Merge
Mon, 19 Jun 2017 11:41:21 +0200 8181911: Lambda Analyzer causes compile-time error
jlahoda [Mon, 19 Jun 2017 11:41:21 +0200] rev 45605
8181911: Lambda Analyzer causes compile-time error Summary: When copying Env<AttrContext> for Analyzer, detach returnResult from the outer context. Reviewed-by: mcimadamore
Mon, 12 Jun 2017 12:25:40 -0700 8144185: javac produces incorrect RuntimeInvisibleTypeAnnotations length attribute
cushon [Mon, 12 Jun 2017 12:25:40 -0700] rev 45604
8144185: javac produces incorrect RuntimeInvisibleTypeAnnotations length attribute Reviewed-by: sadayapalam
Sat, 17 Jun 2017 00:15:44 +0000 Added tag jdk-10+12 for changeset ea7475564d07
lana [Sat, 17 Jun 2017 00:15:44 +0000] rev 45603
Added tag jdk-10+12 for changeset ea7475564d07
Fri, 16 Jun 2017 10:32:46 -0700 8180510: jshell tool: crash on entering pseudo-commands: /<id> or /-<n>
rfield [Fri, 16 Jun 2017 10:32:46 -0700] rev 45602
8180510: jshell tool: crash on entering pseudo-commands: /<id> or /-<n> Reviewed-by: jlahoda
Fri, 16 Jun 2017 04:54:37 +0000 Merge
lana [Fri, 16 Jun 2017 04:54:37 +0000] rev 45601
Merge
Thu, 15 Jun 2017 17:24:13 +0000 Added tag jdk-9+174 for changeset 6ab502c6ffb1
lana [Thu, 15 Jun 2017 17:24:13 +0000] rev 45600
Added tag jdk-9+174 for changeset 6ab502c6ffb1
Thu, 15 Jun 2017 10:55:35 -0700 8149146: [javadoc] eliminate doclet.xml
jjg [Thu, 15 Jun 2017 10:55:35 -0700] rev 45599
8149146: [javadoc] eliminate doclet.xml Reviewed-by: ksrini, bpatel
Wed, 05 Jul 2017 23:43:41 +0200 Merge
duke [Wed, 05 Jul 2017 23:43:41 +0200] rev 45598
Merge
Sat, 17 Jun 2017 00:15:54 +0000 Added tag jdk-10+12 for changeset 11062587f5ad
lana [Sat, 17 Jun 2017 00:15:54 +0000] rev 45597
Added tag jdk-10+12 for changeset 11062587f5ad
Fri, 16 Jun 2017 04:55:20 +0000 Merge
lana [Fri, 16 Jun 2017 04:55:20 +0000] rev 45596
Merge
Thu, 15 Jun 2017 17:24:11 +0000 Added tag jdk-9+174 for changeset de2f9156e3ad
lana [Thu, 15 Jun 2017 17:24:11 +0000] rev 45595
Added tag jdk-9+174 for changeset de2f9156e3ad
Wed, 05 Jul 2017 23:43:29 +0200 Merge
duke [Wed, 05 Jul 2017 23:43:29 +0200] rev 45594
Merge
Tue, 20 Jun 2017 14:29:52 -0700 8177561: Remove deprecated for removal portions of com.sun.org.apache
joehw [Tue, 20 Jun 2017 14:29:52 -0700] rev 45593
8177561: Remove deprecated for removal portions of com.sun.org.apache Reviewed-by: lancea, rriggs
Sat, 17 Jun 2017 00:15:55 +0000 Added tag jdk-10+12 for changeset dc68478b53b9
lana [Sat, 17 Jun 2017 00:15:55 +0000] rev 45592
Added tag jdk-10+12 for changeset dc68478b53b9
Fri, 16 Jun 2017 04:56:23 +0000 Merge
lana [Fri, 16 Jun 2017 04:56:23 +0000] rev 45591
Merge
Thu, 15 Jun 2017 17:24:11 +0000 Added tag jdk-9+174 for changeset 6a12bfe13efd
lana [Thu, 15 Jun 2017 17:24:11 +0000] rev 45590
Added tag jdk-9+174 for changeset 6a12bfe13efd
Wed, 05 Jul 2017 23:43:18 +0200 Merge
duke [Wed, 05 Jul 2017 23:43:18 +0200] rev 45589
Merge
Sat, 17 Jun 2017 00:15:56 +0000 Added tag jdk-10+12 for changeset 4a203b007156
lana [Sat, 17 Jun 2017 00:15:56 +0000] rev 45588
Added tag jdk-10+12 for changeset 4a203b007156
Fri, 16 Jun 2017 04:54:42 +0000 Merge
lana [Fri, 16 Jun 2017 04:54:42 +0000] rev 45587
Merge
Thu, 15 Jun 2017 17:24:14 +0000 Added tag jdk-9+174 for changeset 27ec0241c724
lana [Thu, 15 Jun 2017 17:24:14 +0000] rev 45586
Added tag jdk-9+174 for changeset 27ec0241c724
Wed, 05 Jul 2017 23:43:07 +0200 Merge
duke [Wed, 05 Jul 2017 23:43:07 +0200] rev 45585
Merge
Sat, 17 Jun 2017 00:15:49 +0000 Added tag jdk-10+12 for changeset 31f4fe261732
lana [Sat, 17 Jun 2017 00:15:49 +0000] rev 45584
Added tag jdk-10+12 for changeset 31f4fe261732
Fri, 16 Jun 2017 04:56:25 +0000 Merge
lana [Fri, 16 Jun 2017 04:56:25 +0000] rev 45583
Merge
Thu, 15 Jun 2017 17:24:10 +0000 Added tag jdk-9+174 for changeset a1ec0a218e89
lana [Thu, 15 Jun 2017 17:24:10 +0000] rev 45582
Added tag jdk-9+174 for changeset a1ec0a218e89
Wed, 05 Jul 2017 23:42:55 +0200 Merge
duke [Wed, 05 Jul 2017 23:42:55 +0200] rev 45581
Merge
Wed, 21 Jun 2017 11:41:14 -0700 8182565: remove jdk.testlibrary.Utils::tryFindJvmPid and waitForJvmPid methods
iignatyev [Wed, 21 Jun 2017 11:41:14 -0700] rev 45580
8182565: remove jdk.testlibrary.Utils::tryFindJvmPid and waitForJvmPid methods Reviewed-by: rriggs
Tue, 20 Jun 2017 23:27:28 -0700 8182620: Problem list java/lang/String/nativeEncoding/StringPlatformChars.java for JDK-8182569
xiaofeya [Tue, 20 Jun 2017 23:27:28 -0700] rev 45579
8182620: Problem list java/lang/String/nativeEncoding/StringPlatformChars.java for JDK-8182569 Reviewed-by: darcy
Wed, 21 Jun 2017 14:40:38 +0800 8182465: Refactor shell test java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh to java
amlu [Wed, 21 Jun 2017 14:40:38 +0800] rev 45578
8182465: Refactor shell test java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh to java Reviewed-by: alanb
Wed, 21 Jun 2017 12:09:25 +0800 8181575: Refactor locale related shell test java/nio/charset/spi/basic.sh to java
amlu [Wed, 21 Jun 2017 12:09:25 +0800] rev 45577
8181575: Refactor locale related shell test java/nio/charset/spi/basic.sh to java Reviewed-by: psandoz
Wed, 21 Jun 2017 10:30:03 +0800 8182376: Refactor shell test java/nio/file/Path/MacPathTest.sh to java
amlu [Wed, 21 Jun 2017 10:30:03 +0800] rev 45576
8182376: Refactor shell test java/nio/file/Path/MacPathTest.sh to java Reviewed-by: alanb
Tue, 20 Jun 2017 13:43:43 -0700 8182611: extLink ignores text after first newline.
jjg [Tue, 20 Jun 2017 13:43:43 -0700] rev 45575
8182611: extLink ignores text after first newline. Reviewed-by: ksrini
Mon, 19 Jun 2017 18:02:06 -0700 8181478: Refactor java/io shell tests to plain java tests
mli [Mon, 19 Jun 2017 18:02:06 -0700] rev 45574
8181478: Refactor java/io shell tests to plain java tests Reviewed-by: alanb, psandoz
Mon, 19 Jun 2017 11:52:01 +0200 8181419: Race in jdwp invoker handling may lead to crashes or invalid results
stuefe [Mon, 19 Jun 2017 11:52:01 +0200] rev 45573
8181419: Race in jdwp invoker handling may lead to crashes or invalid results Reviewed-by: sspitsyn, sgehwolf, clanger
Mon, 19 Jun 2017 09:29:11 +0200 8181147: JNI_GetStringPlatformChars should have a fast path for UTF-8
redestad [Mon, 19 Jun 2017 09:29:11 +0200] rev 45572
8181147: JNI_GetStringPlatformChars should have a fast path for UTF-8 8182451: Inconsistency between String.getBytes("Cp1252") and JNU_GetStringPlatformChars Reviewed-by: martin, erikj, sherman, chegar, mikael
Mon, 19 Jun 2017 15:48:42 +0800 8182421: Add @modules to java/nio/charset/coders/SJISMappingPropTest.java
amlu [Mon, 19 Jun 2017 15:48:42 +0800] rev 45571
8182421: Add @modules to java/nio/charset/coders/SJISMappingPropTest.java Reviewed-by: alanb
Sun, 18 Jun 2017 18:43:24 -0700 8181912: Refactor locale related shell test test/java/io/File/MacPathTest.sh to java test
mli [Sun, 18 Jun 2017 18:43:24 -0700] rev 45570
8181912: Refactor locale related shell test test/java/io/File/MacPathTest.sh to java test Reviewed-by: alanb, naoto, psandoz, xiaofeya
Mon, 19 Jun 2017 09:41:59 +0800 8181395: Refactor locale related shell tests Charset/default.sh and CheckSJISMappingProp.sh to java
amlu [Mon, 19 Jun 2017 09:41:59 +0800] rev 45569
8181395: Refactor locale related shell tests Charset/default.sh and CheckSJISMappingProp.sh to java Reviewed-by: alanb
Mon, 19 Jun 2017 09:27:17 +0800 8181309: Refactor shell test AsynchronousChannelProvider/custom_provider.sh to java
amlu [Mon, 19 Jun 2017 09:27:17 +0800] rev 45568
8181309: Refactor shell test AsynchronousChannelProvider/custom_provider.sh to java Reviewed-by: alanb
Sat, 17 Jun 2017 00:15:45 +0000 Added tag jdk-10+12 for changeset 3955aa021599
lana [Sat, 17 Jun 2017 00:15:45 +0000] rev 45567
Added tag jdk-10+12 for changeset 3955aa021599
Fri, 16 Jun 2017 17:06:35 -0700 8182388: Backout 8182143
asmotrak [Fri, 16 Jun 2017 17:06:35 -0700] rev 45566
8182388: Backout 8182143 Reviewed-by: xuelei
Fri, 16 Jun 2017 08:00:53 -0700 8182321: Mark java/lang/ProcessHandle/OnExitTest.java as intermittent
xiaofeya [Fri, 16 Jun 2017 08:00:53 -0700] rev 45565
8182321: Mark java/lang/ProcessHandle/OnExitTest.java as intermittent Reviewed-by: rriggs
Fri, 16 Jun 2017 14:09:31 +0200 8181417: Code cleanups in com.sun.jdi
clanger [Fri, 16 Jun 2017 14:09:31 +0200] rev 45564
8181417: Code cleanups in com.sun.jdi Reviewed-by: alanb, stuefe, sspitsyn
Fri, 16 Jun 2017 04:54:54 +0000 Merge
lana [Fri, 16 Jun 2017 04:54:54 +0000] rev 45563
Merge
Thu, 15 Jun 2017 17:24:12 +0000 Added tag jdk-9+174 for changeset 7ebbcd3c853f
lana [Thu, 15 Jun 2017 17:24:12 +0000] rev 45562
Added tag jdk-9+174 for changeset 7ebbcd3c853f
Thu, 15 Jun 2017 15:00:30 -0700 8182143: SHA224-based signature algorithms are not enabled for TLSv12 on Windows
asmotrak [Thu, 15 Jun 2017 15:00:30 -0700] rev 45561
8182143: SHA224-based signature algorithms are not enabled for TLSv12 on Windows Reviewed-by: xuelei
Thu, 15 Jun 2017 17:50:21 +0530 8176192: Incorrect usage of Iterator in Java 8 In com.sun.jndi.ldap.EventSupport.removeNamingListener
vtewari [Thu, 15 Jun 2017 17:50:21 +0530] rev 45560
8176192: Incorrect usage of Iterator in Java 8 In com.sun.jndi.ldap.EventSupport.removeNamingListener Reviewed-by: psandoz
Wed, 05 Jul 2017 23:42:41 +0200 Merge
duke [Wed, 05 Jul 2017 23:42:41 +0200] rev 45559
Merge
Sat, 17 Jun 2017 00:15:50 +0000 Added tag jdk-10+12 for changeset 2b591c4d54e8
lana [Sat, 17 Jun 2017 00:15:50 +0000] rev 45558
Added tag jdk-10+12 for changeset 2b591c4d54e8
Fri, 16 Jun 2017 04:55:29 +0000 Merge
lana [Fri, 16 Jun 2017 04:55:29 +0000] rev 45557
Merge
Thu, 15 Jun 2017 17:24:10 +0000 Added tag jdk-9+174 for changeset f25253621ba1
lana [Thu, 15 Jun 2017 17:24:10 +0000] rev 45556
Added tag jdk-9+174 for changeset f25253621ba1
Mon, 19 Jun 2017 10:32:13 +0200 8181147: JNU_GetStringPlatformChars should have a fast path for UTF-8
redestad [Mon, 19 Jun 2017 10:32:13 +0200] rev 45555
8181147: JNU_GetStringPlatformChars should have a fast path for UTF-8 Reviewed-by: martin, erikj, sherman, chegar, mikael
Sat, 17 Jun 2017 00:15:42 +0000 Added tag jdk-10+12 for changeset 31045970cc45
lana [Sat, 17 Jun 2017 00:15:42 +0000] rev 45554
Added tag jdk-10+12 for changeset 31045970cc45
Fri, 16 Jun 2017 04:54:27 +0000 Merge
lana [Fri, 16 Jun 2017 04:54:27 +0000] rev 45553
Merge
Thu, 15 Jun 2017 17:24:10 +0000 Added tag jdk-9+174 for changeset 78af1824a3ba
lana [Thu, 15 Jun 2017 17:24:10 +0000] rev 45552
Added tag jdk-9+174 for changeset 78af1824a3ba
Wed, 05 Jul 2017 23:42:22 +0200 Added tag jdk-9+174 for changeset 94680c6d60ec
duke [Wed, 05 Jul 2017 23:42:22 +0200] rev 45551
Added tag jdk-9+174 for changeset 94680c6d60ec
Wed, 05 Jul 2017 23:42:20 +0200 Merge jdk-9+174
duke [Wed, 05 Jul 2017 23:42:20 +0200] rev 45550
Merge
Thu, 08 Jun 2017 23:11:43 +0000 Merge
lana [Thu, 08 Jun 2017 23:11:43 +0000] rev 45549
Merge
Thu, 08 Jun 2017 15:50:22 -0700 8180296: Move Javadoc: doclet, taglet specs to specs directory
jjg [Thu, 08 Jun 2017 15:50:22 -0700] rev 45548
8180296: Move Javadoc: doclet, taglet specs to specs directory Reviewed-by: ksrini
Wed, 05 Jul 2017 23:42:07 +0200 Merge
duke [Wed, 05 Jul 2017 23:42:07 +0200] rev 45547
Merge
Thu, 08 Jun 2017 23:11:11 +0000 Merge
lana [Thu, 08 Jun 2017 23:11:11 +0000] rev 45546
Merge
Wed, 07 Jun 2017 21:14:58 -0700 8181639: Add tool and services information to module summary
mchung [Wed, 07 Jun 2017 21:14:58 -0700] rev 45545
8181639: Add tool and services information to module summary Reviewed-by: alanb, psandoz, lancea
Wed, 07 Jun 2017 18:47:54 -0400 8181702: Mark jdk.xml.bind and jdk.xml.ws modules deprecated and for removal
lancea [Wed, 07 Jun 2017 18:47:54 -0400] rev 45544
8181702: Mark jdk.xml.bind and jdk.xml.ws modules deprecated and for removal Reviewed-by: alanb, mchung
Wed, 05 Jul 2017 23:41:51 +0200 Merge
duke [Wed, 05 Jul 2017 23:41:51 +0200] rev 45543
Merge
Thu, 08 Jun 2017 23:11:39 +0000 Merge
lana [Thu, 08 Jun 2017 23:11:39 +0000] rev 45542
Merge
Wed, 07 Jun 2017 21:08:37 -0700 8181639: Add tool and services information to module summary
mchung [Wed, 07 Jun 2017 21:08:37 -0700] rev 45541
8181639: Add tool and services information to module summary Reviewed-by: alanb, psandoz, lancea
Wed, 05 Jul 2017 23:41:36 +0200 Merge
duke [Wed, 05 Jul 2017 23:41:36 +0200] rev 45540
Merge
Thu, 08 Jun 2017 23:11:15 +0000 Merge
lana [Thu, 08 Jun 2017 23:11:15 +0000] rev 45539
Merge
Wed, 07 Jun 2017 18:57:24 -0700 8181639: Add tool and services information to module summary
mchung [Wed, 07 Jun 2017 18:57:24 -0700] rev 45538
8181639: Add tool and services information to module summary Reviewed-by: alanb, psandoz, lancea
Wed, 05 Jul 2017 23:41:19 +0200 Merge
duke [Wed, 05 Jul 2017 23:41:19 +0200] rev 45537
Merge
Fri, 09 Jun 2017 11:26:42 -0700 8181824: Broken javadoc link in java.util.BitSet
psandoz [Fri, 09 Jun 2017 11:26:42 -0700] rev 45536
8181824: Broken javadoc link in java.util.BitSet Reviewed-by: martin
Fri, 09 Jun 2017 16:52:07 +0100 8181867: [tests] Reorganize EchoHandlers
dfuchs [Fri, 09 Jun 2017 16:52:07 +0100] rev 45535
8181867: [tests] Reorganize EchoHandlers Summary: This fix reorganize some test files and rename some test classes. Several classes named EchoHandler in the unnamed package are renamed to make it clear what classes (and sources) tests that use these EchoHandler implementations effectively depend on. Reviewed-by: chegar
Thu, 08 Jun 2017 23:11:21 +0000 Merge
lana [Thu, 08 Jun 2017 23:11:21 +0000] rev 45534
Merge
(0) -30000 -10000 -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 +10000 tip