Merge "Omaha #3757 Added HTTPS flag" into omaha_14.4.1
Former-commit-id:2a7e8dbdf6
[formerly79c2bc3cb1
] [formerly46611ec961
] [formerly46611ec961
[formerlyf16173803c
]] [formerly08734bb4e1
[formerly46611ec961
[formerlyf16173803c
] [formerly08734bb4e1
[formerly dd6f035e86bbd4f9e86ce3b19b7b61c0b3947737]]]] Former-commit-id:08734bb4e1
Former-commit-id: 31286f17ef745c5f6dd90f982cdffecd03f92b67 [formerly 299ef4e72e08baeb7ae8ec921c42a624af5ee93f] [formerly2cd131629e
[formerly9c162af96a
]] Former-commit-id:2cd131629e
Former-commit-id:da87b7e344
This commit is contained in:
commit
dfbf25f1d9
2 changed files with 4 additions and 0 deletions
|
@ -28,6 +28,7 @@
|
||||||
-Dlogback.statusListenerClass=com.raytheon.uf.common.status.logback.UFLogbackInternalStatusListener
|
-Dlogback.statusListenerClass=com.raytheon.uf.common.status.logback.UFLogbackInternalStatusListener
|
||||||
-Dthrift.stream.maxsize=200
|
-Dthrift.stream.maxsize=200
|
||||||
-Dviz.memory.warn.threshold=98
|
-Dviz.memory.warn.threshold=98
|
||||||
|
-Dhttps.certificate.check=false
|
||||||
-XX:+UnlockExperimentalVMOptions
|
-XX:+UnlockExperimentalVMOptions
|
||||||
-XX:G1HeapRegionSize=4M
|
-XX:G1HeapRegionSize=4M
|
||||||
-XX:InitiatingHeapOccupancyPercent=25
|
-XX:InitiatingHeapOccupancyPercent=25
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
-Dthrift.stream.maxsize=200
|
-Dthrift.stream.maxsize=200
|
||||||
-Dviz.memory.warn.threshold=99
|
-Dviz.memory.warn.threshold=99
|
||||||
-Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
|
-Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
|
||||||
|
-Dhttps.certificate.check=false
|
||||||
-XX:MaxDirectMemorySize=1G
|
-XX:MaxDirectMemorySize=1G
|
||||||
-XX:+UnlockExperimentalVMOptions
|
-XX:+UnlockExperimentalVMOptions
|
||||||
-XX:G1HeapRegionSize=4M
|
-XX:G1HeapRegionSize=4M
|
||||||
|
@ -52,10 +53,12 @@
|
||||||
</win>
|
</win>
|
||||||
</launcher>
|
</launcher>
|
||||||
|
|
||||||
|
|
||||||
<vm>
|
<vm>
|
||||||
<windows include="true">jdk1.6.0</windows>
|
<windows include="true">jdk1.6.0</windows>
|
||||||
</vm>
|
</vm>
|
||||||
|
|
||||||
|
|
||||||
<plugins>
|
<plugins>
|
||||||
</plugins>
|
</plugins>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue