Nate Jensen
|
00fb95b9fb
|
Issue #2954 fall back to existing map scales if map scale is missing
Change-Id: I75083325edec689c38f2fe7661c635ddf3e0f527
Former-commit-id: ef72e8e222 [formerly c07802a208] [formerly 6e21526fd2] [formerly ef72e8e222 [formerly c07802a208] [formerly 6e21526fd2] [formerly ed9bee5533 [formerly 6e21526fd2 [formerly c7167ad2f59ba02edc842f321d12cd36cd6da8bb]]]]
Former-commit-id: ed9bee5533
Former-commit-id: 8a296f44dc [formerly 12aa82ee3f] [formerly 1b7296f4e0b0b00a7428592a879e684a9594a9a1 [formerly d07ec00b92]]
Former-commit-id: 0c9f09720e80fe71eeb3ad39fefb92e4902c6206 [formerly 61b8abe589]
Former-commit-id: a559ae9796
|
2014-07-15 18:27:09 -05:00 |
|
Steve Harris
|
539075380d
|
Merge branch 'omaha_14.4.1' into omaha_15.1.1
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
Former-commit-id: a46c22c588 [formerly a893b9b08a] [formerly 05de3fbe54] [formerly a46c22c588 [formerly a893b9b08a] [formerly 05de3fbe54] [formerly a43ffbe052 [formerly 05de3fbe54 [formerly 6d1d1a86cfb70e9ca096f59d9aadf8219efdaeb3]]]]
Former-commit-id: a43ffbe052
Former-commit-id: 914da113f1 [formerly 6920a273e5] [formerly bb3abdc3558b0f06299a9c4d87dd2431f2d137d1 [formerly 202c1a0316]]
Former-commit-id: b85ba4378a5ea7a71f84d2d7905fb78292c8bd46 [formerly 7bf6b4de06]
Former-commit-id: bd9067626f
|
2014-07-14 12:08:09 -05:00 |
|
Nate Jensen
|
399caf2ff6
|
Merge "Omaha #3371 all subprocesses now killed when cave.sh is killed" into omaha_14.4.1
Former-commit-id: a67b7a3005 [formerly a55162c74b] [formerly 2531649c55] [formerly a67b7a3005 [formerly a55162c74b] [formerly 2531649c55] [formerly 9f58d2e08b [formerly 2531649c55 [formerly 97a0d0d8be7dd87e472dc0422a68df94d43095e1]]]]
Former-commit-id: 9f58d2e08b
Former-commit-id: bfd642714a [formerly 289a4bf786] [formerly 1baa67bc1c72c1e0f4b5c907fef13d98c99b0a66 [formerly 363766fcca]]
Former-commit-id: 81ddf83df4487258eb799b75019f3afc294f87a8 [formerly ad23d7e95d]
Former-commit-id: fd9475853b
|
2014-07-14 11:15:01 -05:00 |
|
Brian Clements
|
f505d1221b
|
Omaha #3371 all subprocesses now killed when cave.sh is killed
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2
Former-commit-id: d6e181d301 [formerly 0973e5ac41] [formerly 7e70fbda27] [formerly d6e181d301 [formerly 0973e5ac41] [formerly 7e70fbda27] [formerly ae5fa893a9 [formerly 7e70fbda27 [formerly e4becce5325aad266fd93548d27e5e122b145011]]]]
Former-commit-id: ae5fa893a9
Former-commit-id: 97fc979b3b [formerly a1bce34fda] [formerly ef9dbe97b4271805e63ea28026e72a445813455e [formerly e72c34d361]]
Former-commit-id: dd87970cd72b7fb271a99e965d270def8120be94 [formerly 272c0a2e2d]
Former-commit-id: d8ce5db467
|
2014-07-14 08:05:18 -05:00 |
|
Richard Peter
|
bf183109be
|
Merge "Omaha #3379 Removing DWR" into omaha_14.4.1
Former-commit-id: 90d2108293 [formerly 88419fb8f3] [formerly 0222a89cd4] [formerly 90d2108293 [formerly 88419fb8f3] [formerly 0222a89cd4] [formerly 1c40dc11ef [formerly 0222a89cd4 [formerly 1ed0d8bf50a7a043f9e91afb2bbc849c4399557e]]]]
Former-commit-id: 1c40dc11ef
Former-commit-id: 1dab76f463 [formerly d16ddba2f5] [formerly 91c2b9274636fd96628da212f4a5cb80811946f9 [formerly 2b75d79e0f]]
Former-commit-id: f85235918af1de3ef6706abbddad2e54d7451004 [formerly d1af1f615d]
Former-commit-id: 878c3fe29e
|
2014-07-11 17:46:14 -05:00 |
|
Brian Clements
|
47bb7f609e
|
Omaha #3333 added grid lightning to cave
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221
Former-commit-id: f969720868 [formerly 555251982b] [formerly a50f1e8e70] [formerly f969720868 [formerly 555251982b] [formerly a50f1e8e70] [formerly 29fc7e7ec4 [formerly a50f1e8e70 [formerly 33736a713a2c360e70f5a06972a7a21937f2b34c]]]]
Former-commit-id: 29fc7e7ec4
Former-commit-id: 8fdcc3183e [formerly 140a4a4b15] [formerly e03addef9feeace5539e9b0f6c1a99cbfdc19c03 [formerly e25961a39a]]
Former-commit-id: cd59138399b217c27c21822a756b68d7bb389f6a [formerly db47c98989]
Former-commit-id: b384c87dff
|
2014-07-11 12:18:05 -05:00 |
|
Benjamin Phillippe
|
7b98ae2e01
|
Omaha #3379 Removing DWR
Former-commit-id: e613cb932e [formerly cc9e9b427a] [formerly d110e8428b] [formerly e613cb932e [formerly cc9e9b427a] [formerly d110e8428b] [formerly 4e1d93abf8 [formerly d110e8428b [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]]
Former-commit-id: 4e1d93abf8
Former-commit-id: 63354789de [formerly 5eea012728] [formerly c20f089fcf16ae33c66408335723c47e9c63b082 [formerly 06e73cd55f]]
Former-commit-id: 9c31f8986bfae1d5ec15dea29bd1f66a4ab15fd7 [formerly 11a8186cbc]
Former-commit-id: 0c80abcc15
|
2014-07-11 11:56:44 -05:00 |
|
Brian Clements
|
8c248326c9
|
Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298
Former-commit-id: ed03db05ea [formerly 987d514fa3] [formerly 871a8655c8] [formerly ed03db05ea [formerly 987d514fa3] [formerly 871a8655c8] [formerly 0113e109d3 [formerly 871a8655c8 [formerly e89daec94625b33f20fc6a9106a63202f4bc7075]]]]
Former-commit-id: 0113e109d3
Former-commit-id: 034bf93c29 [formerly ed9ba91d4e] [formerly 177f6db44761392bd73fa9adfd0d53bb7bd07a4b [formerly c32592fd1c]]
Former-commit-id: 6ad739e068be5779be4f5fd46af88fce9eedd972 [formerly 94f5989af7]
Former-commit-id: f2d27e2f8b
|
2014-07-10 16:31:11 -05:00 |
|
Brian Clements
|
fc54248d9a
|
Omaha #3214 fixed cache object usage in lightning resource
pulse and cloud flashes were not updated properly in the cache
Change-Id: Idf17aeb444f93c73901c26da9640f0a8f4a6a486
Former-commit-id: fc246aa082 [formerly dba1fb3fc1] [formerly 994226e82b] [formerly fc246aa082 [formerly dba1fb3fc1] [formerly 994226e82b] [formerly ac8f861112 [formerly 994226e82b [formerly 206fd1556b6b7bdfcf432b0c13af9b38d1f1d393]]]]
Former-commit-id: ac8f861112
Former-commit-id: e2d16bde70 [formerly f9dad29ad8] [formerly 58cd6b777893efcab676bfb302e4f2adb7c4adbf [formerly e74fcfbce1]]
Former-commit-id: 30d73e14407e75bece52e4efa2274ee651889e84 [formerly 97451515b6]
Former-commit-id: 5e7da3ffac
|
2014-07-09 14:13:47 -05:00 |
|
steve.naples
|
afe17e2857
|
ASM #253 Update RadarBiasTableDialog fix issue of not saving undo.
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88
Former-commit-id: 72ae26401d [formerly 2ebfd61f12] [formerly 339fcbc18a] [formerly 72ae26401d [formerly 2ebfd61f12] [formerly 339fcbc18a] [formerly 0bd7b6c65b [formerly 339fcbc18a [formerly 24b9a6e0801cc653062a71d86090df3836aa86a4]]]]
Former-commit-id: 0bd7b6c65b
Former-commit-id: 04208dc837 [formerly 6b58fb2509] [formerly 05c10c3b18e9704c50ddf97525d0165e3c4e0b2b [formerly aa8c11d134]]
Former-commit-id: f17ec83e9cf28c564f411b5e04c09e7a9226b11f [formerly 458dd1fe8f]
Former-commit-id: db04c1a2ec
|
2014-07-09 15:42:51 +00:00 |
|
Nate Jensen
|
879c34599b
|
Omaha #3361 reduce number of extraneous localization requests at GFE
startup
Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed
Former-commit-id: 93012a8b76 [formerly c3bd61a2c0] [formerly 0c397d2b7e] [formerly 93012a8b76 [formerly c3bd61a2c0] [formerly 0c397d2b7e] [formerly 5547ea1c7d [formerly 0c397d2b7e [formerly efa10ca2702ecee4535711be06373e5d079ac117]]]]
Former-commit-id: 5547ea1c7d
Former-commit-id: 0d5c29fee9 [formerly d5f944d203] [formerly 03c7194ee9d1c11cb9ccecc4e9a319197e8bdda4 [formerly af08cc189f]]
Former-commit-id: ce0d12bcfaa0a5262bdc5ed9899758826739c126 [formerly 9931cfdf84]
Former-commit-id: ed4cfdb1f3
|
2014-07-09 09:24:31 -05:00 |
|
Ron Anderson
|
57b2705ef7
|
Issue #3332 Fixed race condition which could cause GFE grid saving to hang
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652
Former-commit-id: 10f629428e [formerly 4b4629a2fd] [formerly 111b04296c] [formerly 10f629428e [formerly 4b4629a2fd] [formerly 111b04296c] [formerly 5efba03474 [formerly 111b04296c [formerly b01b72b896b894568acce6a8dc4d45328a06067a]]]]
Former-commit-id: 5efba03474
Former-commit-id: 9691bf2dee [formerly e39615ab7a] [formerly 629e83f9edf01bd52b896613ba791f05dcdcec19 [formerly 1cc0ff4ab7]]
Former-commit-id: 8d831abf9d91162a2834bb4a5f34984776cfb287 [formerly 0a7c4c855e]
Former-commit-id: a1a980ed6e
|
2014-07-09 08:56:06 -05:00 |
|
steve.naples
|
0bf2f3eed5
|
ASM #253 Update RadarBiasTableDialog fix issue of not saving.
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673
Former-commit-id: 9dcf27e217 [formerly 29ca2338b8] [formerly 75969ceec2] [formerly 9dcf27e217 [formerly 29ca2338b8] [formerly 75969ceec2] [formerly 24b0d49a5b [formerly 75969ceec2 [formerly 9021eca6b32dd2b3859cd928c14a0e40a4907c13]]]]
Former-commit-id: 24b0d49a5b
Former-commit-id: bd3e8973d2 [formerly 94e246b619] [formerly 8b99713670e5a0d85aee792b8067ae607b78230c [formerly ea071e81f5]]
Former-commit-id: 92c9bb35d883903b31bca5165db414369b88663d [formerly 23ff3f3fe7]
Former-commit-id: 10e2eaa6ed
|
2014-07-08 16:32:08 +00:00 |
|
Brian Clements
|
a34aaf537a
|
Omaha #3333 removed redundant field from viz lightning
Change-Id: I3821f7991757f97b976bac8cde502da977ea0978
Former-commit-id: 392b640b47 [formerly 91b136c2a0] [formerly 572d95e78a] [formerly 392b640b47 [formerly 91b136c2a0] [formerly 572d95e78a] [formerly e4795f6a13 [formerly 572d95e78a [formerly 2e701ade395cb2ec81d86af714fad825e146dc25]]]]
Former-commit-id: e4795f6a13
Former-commit-id: 2d1fb0d3ab [formerly 9afb344828] [formerly 5e6b3db09e1e362ab49d6d923a871327b0f365f5 [formerly e1d5d86d29]]
Former-commit-id: a12398e87e16ca4a9190c1dc1d3481fb90f9144c [formerly b2a4b1da71]
Former-commit-id: f3735af783
|
2014-07-07 15:13:28 -05:00 |
|
Brian.Dyke
|
8a2b16fda0
|
Merge branch 'asm_14.2.2' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.2
Former-commit-id: 6ea9a4cc23 [formerly a33fdeb558] [formerly 2ef4767652] [formerly 6ea9a4cc23 [formerly a33fdeb558] [formerly 2ef4767652] [formerly 89c0457b1d [formerly 2ef4767652 [formerly 845aebda9d8af143e3a6828c066b291e0343a020]]]]
Former-commit-id: 89c0457b1d
Former-commit-id: 05693a6e32 [formerly 6be18f0dd4] [formerly db3d46678c921e727f9c882b090df6f420aabdba [formerly a2dc10847c]]
Former-commit-id: ad91e4d3778911324da29cefafd1f15078211a6d [formerly e9e9abd3db]
Former-commit-id: f14f792377
|
2014-07-07 13:33:35 -04:00 |
|
Brian Clements
|
175c675ac9
|
Omaha #1255 fixed collaboration colors
config.xml was not in build.properties
provided a fallback default if config is missing
Change-Id: I9e531b210d6bbe48ce5daf8a760b0bbcf2daa3c6
Former-commit-id: c024dd86a1 [formerly aeb093ad95] [formerly 0d4cd4bab8] [formerly c024dd86a1 [formerly aeb093ad95] [formerly 0d4cd4bab8] [formerly da53d9ccc7 [formerly 0d4cd4bab8 [formerly 5ee2e28b8eb94174c7fce660cccc4a77345617a4]]]]
Former-commit-id: da53d9ccc7
Former-commit-id: 55c2c91ec9 [formerly 2cea766aed] [formerly 1a54c47307e1f8f59e93102d31d75908a974c968 [formerly e6e84d2c71]]
Former-commit-id: 69df56fbd21f5de41d96518bf209cc59acc31c5a [formerly 9a1bc8c521]
Former-commit-id: 2bebd393d8
|
2014-07-07 12:29:12 -05:00 |
|
Richard Peter
|
4c1f802f39
|
Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
Former-commit-id: 1dca75e12d [formerly 4219dbeec8] [formerly ba1bd20407] [formerly 1dca75e12d [formerly 4219dbeec8] [formerly ba1bd20407] [formerly 8c17e9cef2 [formerly ba1bd20407 [formerly 3bbe66d8fe2faacc90c695822b61ffad9de0041f]]]]
Former-commit-id: 8c17e9cef2
Former-commit-id: 95aad91ab1 [formerly 3e19911306] [formerly 775632f0e76f18c983cc243c8d72112f19425048 [formerly 741fc59f34]]
Former-commit-id: 90f5c3e857fd6ca6a1c0b4699a3321c8f854e15c [formerly b4e4629d24]
Former-commit-id: 1399f0cd57
|
2014-07-07 09:39:28 -05:00 |
|
Richard Peter
|
fe1e6d235e
|
Merge "Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response" into omaha_15.1.1
Former-commit-id: c2deb63b76 [formerly 4312c9c569] [formerly 42ec8874c8] [formerly c2deb63b76 [formerly 4312c9c569] [formerly 42ec8874c8] [formerly 06a1d1555c [formerly 42ec8874c8 [formerly 6d960e34632c2f615720c0550296d38feb8c90f6]]]]
Former-commit-id: 06a1d1555c
Former-commit-id: 8d8ff4bbfe [formerly d27ebb1175] [formerly ef7eb34bc8e95ee28d5c262f83862f6faf359c49 [formerly 804e9d1035]]
Former-commit-id: f43ddb1de4e68d51b421a27dd3fd0555bc4d5b12 [formerly b97f693554]
Former-commit-id: 48d293abd6
|
2014-07-07 09:30:09 -05:00 |
|
Ron Anderson
|
22e3cf10db
|
Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc
Former-commit-id: 56389537c2 [formerly fd16321f82] [formerly 8d50f9d15a] [formerly 56389537c2 [formerly fd16321f82] [formerly 8d50f9d15a] [formerly 24faa48233 [formerly 8d50f9d15a [formerly 1e9e5abc477785c5b8cda9dd214da7de83532b9f]]]]
Former-commit-id: 24faa48233
Former-commit-id: d258c29189 [formerly ae401db2ab] [formerly a279ec0ef46f5b0790579386a6f658d12703774c [formerly 87664d86a5]]
Former-commit-id: fc50f818ad6ebffb5fd2d4a546552c91d464f016 [formerly 9a873532ad]
Former-commit-id: 6935f82cfa
|
2014-07-07 09:02:14 -05:00 |
|
Roger Ferrel
|
910ac7107d
|
Omaha #3348 Handle Enter event on Open's tree and text field.
Change-Id: I3409e7cdee6c97d7d7f2c320ba0ac233fbf602d4
Former-commit-id: 045cd846ec [formerly 1964c7c4f7] [formerly 6305bfdcb6] [formerly 045cd846ec [formerly 1964c7c4f7] [formerly 6305bfdcb6] [formerly f064f0d102 [formerly 6305bfdcb6 [formerly 29cc43c5f9b43a51b24b702f04f0a62fab1bd356]]]]
Former-commit-id: f064f0d102
Former-commit-id: eee0c50e53 [formerly 74f5c7eb82] [formerly abfc8ff360788b3eeb598ef96de13bbc85a6ac0e [formerly 7649930247]]
Former-commit-id: 568824ce2c18c74e34e3a13d3fc7676030d9aa04 [formerly da45f3e5e2]
Former-commit-id: 0554d1834c
|
2014-07-07 08:52:50 -05:00 |
|
Brian Clements
|
42250dbe29
|
Omaha #3342 added count to collaboration participant list
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e
Former-commit-id: aad63c257d [formerly c3a25024ae] [formerly bfd9f59de8] [formerly aad63c257d [formerly c3a25024ae] [formerly bfd9f59de8] [formerly e4c9a13adb [formerly bfd9f59de8 [formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]]]
Former-commit-id: e4c9a13adb
Former-commit-id: b5c4951144 [formerly 50d2c6e24c] [formerly e2f81d3a7a49c030107992abebd7d8580750a677 [formerly bd9520f4fe]]
Former-commit-id: cd76914370d3d1df64ffd22b1b50e22e0b336ba1 [formerly 276dd801f2]
Former-commit-id: 55bcd816ff
|
2014-07-03 15:11:48 -05:00 |
|
David Friedman
|
b2c35e26d6
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: b82fb691e0 [formerly 8784501bba] [formerly a45fe1dad0] [formerly b82fb691e0 [formerly 8784501bba] [formerly a45fe1dad0] [formerly db8977e281 [formerly a45fe1dad0 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]]]
Former-commit-id: db8977e281
Former-commit-id: 363de7a3c5 [formerly 5270711c5d] [formerly c850f84db3b8b601f2bbda41059ace7ce49e7f85 [formerly d36834080e]]
Former-commit-id: bb504fd33ed91e33e9927f5c6b5ff9592840208c [formerly 4f53bbd556]
Former-commit-id: c44e9f88f6
|
2014-07-03 13:58:24 +00:00 |
|
Roger Ferrel
|
79f087b47e
|
Omaha #3318 Changes to add GEFS to volumen browser.
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e
Former-commit-id: b56fe77cbf [formerly 2723c92167] [formerly 02d9609862] [formerly b56fe77cbf [formerly 2723c92167] [formerly 02d9609862] [formerly 1869745cce [formerly 02d9609862 [formerly a8346a3ffd677f916c14e0ed3589e4e582cb57b5]]]]
Former-commit-id: 1869745cce
Former-commit-id: e39f121e2f [formerly 37c05adfaf] [formerly 2019d68e3d931cb5d78090dac17da8e40c293a1c [formerly 7f50b8fb93]]
Former-commit-id: de000dd4bb55aaf6060d960844bb751811565b11 [formerly a7daeebc77]
Former-commit-id: 862a065051
|
2014-07-02 14:27:28 -05:00 |
|
Brian Clements
|
0a5aa48230
|
Omaha #3245 caveUtil.sh handle memory overide in vm args
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc
Former-commit-id: 92be869624 [formerly fdec99abc5] [formerly 013292ce9d] [formerly 92be869624 [formerly fdec99abc5] [formerly 013292ce9d] [formerly 2773cf8935 [formerly 013292ce9d [formerly 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c]]]]
Former-commit-id: 2773cf8935
Former-commit-id: fff99d35ee [formerly 767d8abd20] [formerly 6f1522e1278daecbab2015532d3b9735aa656635 [formerly 648ffac146]]
Former-commit-id: dcb07a7cef6bd3e14b77eb9e604caed1f47d482d [formerly 6dea5ec026]
Former-commit-id: c502009375
|
2014-07-02 14:20:10 -05:00 |
|
Juliya Dynina
|
df5f676026
|
Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
Former-commit-id: 3cb8068313 [formerly 67580e73cd] [formerly 244b2f5f3a] [formerly 3cb8068313 [formerly 67580e73cd] [formerly 244b2f5f3a] [formerly 470d50b4e4 [formerly 244b2f5f3a [formerly d6ae0d12f104de38b8fa770e4576b96a32da360c]]]]
Former-commit-id: 470d50b4e4
Former-commit-id: 813a43336b [formerly d705c8c8a4] [formerly 72e68682747424c39bbb0d820e2f6e0c0ed5664e [formerly b1cec7d40e]]
Former-commit-id: c0a266fcaa2641e6b866cd9366ac8230ded3faa6 [formerly 3f043077b3]
Former-commit-id: d3073a02a7
|
2014-07-02 14:17:11 -05:00 |
|
Steve Harris
|
f1fe74e810
|
Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
Former-commit-id: eaa91efeec [formerly 9b7f820b06] [formerly 136af3f7e2] [formerly eaa91efeec [formerly 9b7f820b06] [formerly 136af3f7e2] [formerly 0ef8a057f9 [formerly 136af3f7e2 [formerly c88d3136dbadab41df5fbf37b4b7c821dfcd07d9]]]]
Former-commit-id: 0ef8a057f9
Former-commit-id: e33ef8294c [formerly cb8192cfaf] [formerly 98fbbbbfbae1101e8159ae2009421c421b3054fd [formerly 9f61f60f65]]
Former-commit-id: 8bf30c96c0516a61b493f4f6a6ab8dec379de18a [formerly a12a736737]
Former-commit-id: a19a11998f
|
2014-07-02 13:38:08 -05:00 |
|
Richard Peter
|
605f3eb2e2
|
Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
Former-commit-id: 1c07ac97d1 [formerly 9c41b7c23e] [formerly 59325cf1f1] [formerly 1c07ac97d1 [formerly 9c41b7c23e] [formerly 59325cf1f1] [formerly 27ba905947 [formerly 59325cf1f1 [formerly 693b0f2deb787ee3bb039a1c8807c1b2ae37c3a6]]]]
Former-commit-id: 27ba905947
Former-commit-id: 2bcaeba573 [formerly a22847695d] [formerly 419af79068d9745f445fda7d8a758b4df367781b [formerly 127ce13eb8]]
Former-commit-id: b099c2c2e0c375a4c1927f8de4cdbf8545ddaa80 [formerly a357fc835b]
Former-commit-id: 6710269555
|
2014-07-02 11:51:26 -05:00 |
|
Nate Jensen
|
22149e3ccc
|
Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
Former-commit-id: 0031f7adf5 [formerly e193fe4719] [formerly 324194117a] [formerly 0031f7adf5 [formerly e193fe4719] [formerly 324194117a] [formerly 14b514df2c [formerly 324194117a [formerly 1a934dbd4fc637cec948f25e3a34a2f874ed0b83]]]]
Former-commit-id: 14b514df2c
Former-commit-id: 7f89f61ab6 [formerly be426fc965] [formerly c2d54b4085047fd6f9014cc3a8a78b63b52a1bab [formerly f39f6858e2]]
Former-commit-id: b261915878e797637ac87390cd55b581495bd6fd [formerly 760adb2b77]
Former-commit-id: 54a1daffc6
|
2014-07-02 11:20:26 -05:00 |
|
Nate Jensen
|
a80e3727ab
|
Omaha #3165 build viz.useradmin before viz.datadelivery
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49
Former-commit-id: a38a776ac6 [formerly 15d6ff7f79] [formerly f6cbccdc5c] [formerly a38a776ac6 [formerly 15d6ff7f79] [formerly f6cbccdc5c] [formerly 74e2bd1670 [formerly f6cbccdc5c [formerly 5c498bb7c3bf986cba9f150058406238e64d9b65]]]]
Former-commit-id: 74e2bd1670
Former-commit-id: 480b5b5863 [formerly db24013aa6] [formerly 75b52b38b35362eb3e87ef30cfcfd7e988c52e0c [formerly e9b31a4429]]
Former-commit-id: 3b726b72ea38dd26b8a5f934112cbe9fddad43c9 [formerly db9550e367]
Former-commit-id: f4540db824
|
2014-07-02 11:18:59 -05:00 |
|
steve.naples
|
0f4f7230ef
|
ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f
Former-commit-id: e82b0ae895 [formerly 3d75da3db0] [formerly 66c3241bc4] [formerly e82b0ae895 [formerly 3d75da3db0] [formerly 66c3241bc4] [formerly 4e959af1b4 [formerly 66c3241bc4 [formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]]]
Former-commit-id: 4e959af1b4
Former-commit-id: dbd231a099 [formerly f1c92f1e35] [formerly 18ba10573377ee74433b2ab0bbbbc0f2efa06dea [formerly 3cfabd29bc]]
Former-commit-id: e33d6b9199b205144f76ed9c11a26bf937dec501 [formerly 93c8f822cc]
Former-commit-id: 9f52699bd2
|
2014-07-02 15:30:48 +00:00 |
|
Brian Clements
|
67ae3d92ac
|
Omaha #1255 added collaboration specific color presets
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f
Former-commit-id: 6c381d53ed [formerly 08724fefd7] [formerly 8b5ad1ec33] [formerly 6c381d53ed [formerly 08724fefd7] [formerly 8b5ad1ec33] [formerly eac871eed7 [formerly 8b5ad1ec33 [formerly 87ed36851c390058ab4c92977ecc552cab869d26]]]]
Former-commit-id: eac871eed7
Former-commit-id: 2d1a994bfc [formerly ea1ac8ee8f] [formerly 0a47f310c2bc5e76e5ed2484684f46b47351e783 [formerly cd282ef018]]
Former-commit-id: 05bc19a3cf47dc045c80f93a19cbd2c2d220635e [formerly d066846c3f]
Former-commit-id: 2cd0d94e5d
|
2014-07-02 10:02:52 -05:00 |
|
Nate Jensen
|
2d6a340288
|
Omaha #3165 attempt to fix build
Change-Id: I83354442493b532b711fc3febb4163428b89a372
Former-commit-id: 6f28f24afa [formerly 1373af3e55] [formerly a93af621d8] [formerly 6f28f24afa [formerly 1373af3e55] [formerly a93af621d8] [formerly 765ac1258b [formerly a93af621d8 [formerly 4f092220cb779c96660ec92509b9720b66c3d4a3]]]]
Former-commit-id: 765ac1258b
Former-commit-id: b31f618153 [formerly bbd50040a5] [formerly 54fa8041ee3052325df6cccd79220220bae3bcdd [formerly 264ac4d8a3]]
Former-commit-id: 4a6c0f0533d3de82d21896cbe01b6e6c1a176864 [formerly d1d3aa94a6]
Former-commit-id: ef967d42e3
|
2014-07-02 10:01:05 -05:00 |
|
Nate Jensen
|
21d3d905b1
|
Issue #3337 disable logback packaging data in cave
Former-commit-id: 2baedbf6b8 [formerly 56363ffc4a] [formerly c003d70168] [formerly 2baedbf6b8 [formerly 56363ffc4a] [formerly c003d70168] [formerly 939fde1575 [formerly c003d70168 [formerly db10ba5a37dbe219110f4f902bf9257f2f220b3d]]]]
Former-commit-id: 939fde1575
Former-commit-id: 25379a63f6 [formerly c421e2de75] [formerly 3c068152fc5db062515196cd9a0c4241b85b8f92 [formerly a2cfcd8716]]
Former-commit-id: f92a2a465f2193ba867848c40d1d3ca215e457ba [formerly 75ffabbcc2]
Former-commit-id: b54a9694ee
|
2014-07-02 09:24:15 -05:00 |
|
Nate Jensen
|
a3949b4437
|
Omaha #3165 separate registry plugins for viz to support hazard services
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4
Former-commit-id: d873599954 [formerly a16d8689e9] [formerly f10efa300c] [formerly d873599954 [formerly a16d8689e9] [formerly f10efa300c] [formerly f32bf19eb7 [formerly f10efa300c [formerly 4fedf54b9e2102268c873550da9c567edc2dd255]]]]
Former-commit-id: f32bf19eb7
Former-commit-id: bdb4d8e102 [formerly ec64800f28] [formerly 698bed9b285b34465367799322f3d30195e6be16 [formerly 55dcecc7a7]]
Former-commit-id: 0b197806e0b2ceee741054932d4a8acc506b8f4d [formerly e659a0702d]
Former-commit-id: 8c99b38625
|
2014-07-01 17:37:08 -05:00 |
|
Richard Peter
|
0b0b58e89c
|
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 948e0cd011 [formerly 552ac6d640] [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e [formerly fc27824dbc]]
Former-commit-id: 98c7362b289abd5b8e115f957b14dcd73116b99a [formerly 0fefdc7cd6]
Former-commit-id: 342192e967
|
2014-07-01 15:34:39 -05:00 |
|
Steve Harris
|
7408b3e09d
|
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: 6a7aeb3557 [formerly f68e051938] [formerly 1c8dc56d49] [formerly 6a7aeb3557 [formerly f68e051938] [formerly 1c8dc56d49] [formerly 30cdbff7f8 [formerly 1c8dc56d49 [formerly 382c772c196711d230395f34a04559c188880622]]]]
Former-commit-id: 30cdbff7f8
Former-commit-id: 3369bc4a1d [formerly a4d91c59d6] [formerly f86265bab0c346864e940cc8c360ec5235644553 [formerly 6f9129ac78]]
Former-commit-id: 6030625bf5e788ecaebe0b3ec7cdd364685df43e [formerly d600ed9acf]
Former-commit-id: 15267970e4
|
2014-07-01 13:38:18 -05:00 |
|
Nate Jensen
|
eee4a69f11
|
Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
Former-commit-id: 71025bcc3d [formerly 81ca7a9e9f] [formerly c0d36e9a69] [formerly 71025bcc3d [formerly 81ca7a9e9f] [formerly c0d36e9a69] [formerly 1183c0538e [formerly c0d36e9a69 [formerly 3d0df846090261417f9c9b2e75cf6c439f9b979f]]]]
Former-commit-id: 1183c0538e
Former-commit-id: 886348da08 [formerly 52d5edac63] [formerly ad38ccbb38ccc3c1e25afc6279df150354266fb5 [formerly cb9e715aec]]
Former-commit-id: 7e40e67a6c3c32d32eefa89c005c098e6189c848 [formerly 10dee29029]
Former-commit-id: 7d03309e18
|
2014-07-01 10:30:54 -05:00 |
|
Nate Jensen
|
c790f68d66
|
Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
Former-commit-id: 479b22f6a1 [formerly ac0f0e2298] [formerly 0a9fc691b9] [formerly 479b22f6a1 [formerly ac0f0e2298] [formerly 0a9fc691b9] [formerly fbda7c4489 [formerly 0a9fc691b9 [formerly 221f81f4368a6bbd69255a1a148e055d65a2c957]]]]
Former-commit-id: fbda7c4489
Former-commit-id: d1ce9eed5b [formerly fe1f9e8977] [formerly 42f3d41f4fbd3ce168d8d1117e5ce0b5a752ff73 [formerly 9e6433f44b]]
Former-commit-id: c95a4ea6c20a688372f25863036f83f25fb0d751 [formerly 6f0d007112]
Former-commit-id: 73bdd3a339
|
2014-07-01 10:22:25 -05:00 |
|
Steve Harris
|
1bbbdc9c62
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: d70da4127e [formerly 7fb4663d75] [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6 [formerly dcbab5621f]]
Former-commit-id: 8343b8e876918b72044e0b509f5b5b8afdbd53e2 [formerly 71357da9d2]
Former-commit-id: 8fb747ad27
|
2014-07-01 11:08:46 -04:00 |
|
Juliya Dynina
|
01f10d8e38
|
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 9fc999e435 [formerly bf765525b7] [formerly b5e4bc1fdc] [formerly 9fc999e435 [formerly bf765525b7] [formerly b5e4bc1fdc] [formerly 102da2d0f7 [formerly b5e4bc1fdc [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]]]
Former-commit-id: 102da2d0f7
Former-commit-id: 174d866359 [formerly b4d23902a7] [formerly 2d2b83dfaec86884c0ce72c54cf9440fd6074009 [formerly 7ed2a8cbd4]]
Former-commit-id: 4eefb3ff8da1d8b45bbb5382f3de7f17a72b1b23 [formerly 8f3581340b]
Former-commit-id: 5a9181fcc1
|
2014-07-01 10:05:57 -05:00 |
|
Richard Peter
|
ffe546f816
|
Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
Former-commit-id: 1024035422 [formerly 20eeb493bb] [formerly 6d9db0784a] [formerly 1024035422 [formerly 20eeb493bb] [formerly 6d9db0784a] [formerly e6ac1b2ec8 [formerly 6d9db0784a [formerly 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9]]]]
Former-commit-id: e6ac1b2ec8
Former-commit-id: 17839c2514 [formerly 2965150f36] [formerly f3ceb72fd3502a79aad5e85f5fd66b79cc0bab66 [formerly 3de8492ff3]]
Former-commit-id: a70bbfc5b1d3137936ce79f8cf308613fb74cf69 [formerly e659b5a694]
Former-commit-id: 8c2a97eb67
|
2014-07-01 09:48:20 -05:00 |
|
Nate Jensen
|
ee9c8b0fb9
|
Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
Former-commit-id: 0080d97655 [formerly 03efa73bd7] [formerly 63bc6ed372] [formerly 0080d97655 [formerly 03efa73bd7] [formerly 63bc6ed372] [formerly fb84c94552 [formerly 63bc6ed372 [formerly 933384a7ace268be2c267c7dd630dee6d1d42fd0]]]]
Former-commit-id: fb84c94552
Former-commit-id: d4b265fcca [formerly 7314f9c2f1] [formerly 4978882e135ef3f25c2e0ca1dfb306b8b77a8b49 [formerly 01115d0ad0]]
Former-commit-id: 771686decac75f30c6529d246ca4f20201dfebad [formerly a2ab4f6c76]
Former-commit-id: 94cd22b009
|
2014-06-30 16:21:09 -05:00 |
|
Brian Clements
|
9f8aea91aa
|
Omaha #1798 fixed collaboration drawing issues when leader shares new map
fixed cursor icon not updating properly
fixed attempting to draw to inactive layer
Change-Id: Ic0f29feddbd611d918ba9d7e5a515a7624bf72aa
Former-commit-id: 309900daab [formerly 0125117d9c] [formerly 88ba6b47ad] [formerly 309900daab [formerly 0125117d9c] [formerly 88ba6b47ad] [formerly fc70dbc86e [formerly 88ba6b47ad [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]]]
Former-commit-id: fc70dbc86e
Former-commit-id: 7ffa3c80c1 [formerly b186894f32] [formerly a1b5881328dc0f2810d69ead13548d6326a348b7 [formerly 44f8b3dce1]]
Former-commit-id: 90997d544f594bee31f8c51f3afea29977b1417d [formerly 0be4260b4c]
Former-commit-id: be0185379b
|
2014-06-30 15:57:58 -05:00 |
|
Nate Jensen
|
be7402f054
|
Omaha #3245 fix detection of correct ini file
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7
Former-commit-id: e9ffe3f2d6 [formerly d72b56b988] [formerly bca39f8b39] [formerly e9ffe3f2d6 [formerly d72b56b988] [formerly bca39f8b39] [formerly 48249301fc [formerly bca39f8b39 [formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453]]]]
Former-commit-id: 48249301fc
Former-commit-id: 4dd144d873 [formerly 0f0e890fce] [formerly c525443c556f5d3c4e3585bc6ee865de49c0fa07 [formerly 1d6912b4dd]]
Former-commit-id: 8838747449e3a1b1a8d2c17d9a358b4e5376a19f [formerly 635e902b80]
Former-commit-id: d189ad3b7a
|
2014-06-30 15:53:41 -05:00 |
|
Nate Jensen
|
7f5285bf96
|
Omaha #3165 remove deprecated buildColorMap()
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed
Former-commit-id: b7c6ab2386 [formerly a393ad429a] [formerly 766d3323d3] [formerly b7c6ab2386 [formerly a393ad429a] [formerly 766d3323d3] [formerly 128950ec19 [formerly 766d3323d3 [formerly 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c]]]]
Former-commit-id: 128950ec19
Former-commit-id: c8d32368ee [formerly 4ac06c06ee] [formerly d73b0a686415d6d641d233bfd24d10daefab34d7 [formerly 2bf3449e00]]
Former-commit-id: f3f1fbc5a2e3ec9b02255dccd1989db205cdb8ee [formerly 345de597a6]
Former-commit-id: 25b2c1fa3e
|
2014-06-30 13:22:57 -05:00 |
|
Lee Venable
|
c65c39934d
|
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
Former-commit-id: b3f0099029 [formerly 02037fc2df] [formerly 588d3084da] [formerly b3f0099029 [formerly 02037fc2df] [formerly 588d3084da] [formerly 07a7a00256 [formerly 588d3084da [formerly 3d267d269db54c12852b6b6e8c529d826fad1d90]]]]
Former-commit-id: 07a7a00256
Former-commit-id: 4f413032e3 [formerly e5f1eaf67d] [formerly fc579be7cecbd579b95c1f5d5f7bbe974dc68c31 [formerly c6e53f6a9b]]
Former-commit-id: 049ab47ed6895126be0b8ff0b09a75d6c325e763 [formerly 6046a2cbe1]
Former-commit-id: 44f67ce5ad
|
2014-06-30 13:15:31 -05:00 |
|
Qinglu.Lin
|
a4d359fce0
|
ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81
Former-commit-id: 660d1c9ff2 [formerly 1180b31875] [formerly 1200633cd2] [formerly 660d1c9ff2 [formerly 1180b31875] [formerly 1200633cd2] [formerly 1d52d020eb [formerly 1200633cd2 [formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]]]]
Former-commit-id: 1d52d020eb
Former-commit-id: 712f3b0f46 [formerly 5e07f13dd8] [formerly 79c9a926a4430a2e87a6959f559d52c89cb1c374 [formerly 6e4b7e1e6d]]
Former-commit-id: d7eb9af4998b1fcd67d349f3068f4af192e86aff [formerly 3eaedad105]
Former-commit-id: 7235488050
|
2014-06-30 13:09:15 -04:00 |
|
Nate Jensen
|
8771aee35d
|
Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
Former-commit-id: 914683e8a5 [formerly 1137ef84fd] [formerly 9fddc57142] [formerly 914683e8a5 [formerly 1137ef84fd] [formerly 9fddc57142] [formerly fdddf1e096 [formerly 9fddc57142 [formerly fe2b362a609f2d9aa60bc21e8c23ebbcc118a5dd]]]]
Former-commit-id: fdddf1e096
Former-commit-id: 108be98832 [formerly cc66308aaa] [formerly 9468d0a901837ec71be397a13e71483e27e0c273 [formerly 1ac5c54ee3]]
Former-commit-id: 44b6830b6ca7df9073bb2997f0cd12ba1cc234a3 [formerly c6c921279a]
Former-commit-id: 29a41f81c2
|
2014-06-30 12:03:21 -05:00 |
|
Slav Korolev
|
896b7c59d1
|
Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
Former-commit-id: 64e9564de0 [formerly cd740de298] [formerly 1b870e21fc] [formerly 64e9564de0 [formerly cd740de298] [formerly 1b870e21fc] [formerly 1956077e1a [formerly 1b870e21fc [formerly 5c5513637b7eb223572cc3425a3c1623cde84d90]]]]
Former-commit-id: 1956077e1a
Former-commit-id: 3e4c08d4ef [formerly e8811128fc] [formerly f18e8934ed21b7acc8f3181e19942bfba56cdf4c [formerly 0f5a2c0233]]
Former-commit-id: c7a99399c01956b4c0308375cdf8c555baeec8f2 [formerly a78f0ea765]
Former-commit-id: 5395df01c9
|
2014-06-30 09:40:32 -04:00 |
|
Richard Peter
|
c2835d25ac
|
Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
Former-commit-id: 5a74a3cf99 [formerly bcffac8875] [formerly 706409b459] [formerly 5a74a3cf99 [formerly bcffac8875] [formerly 706409b459] [formerly f4cdd661fe [formerly 706409b459 [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]]]
Former-commit-id: f4cdd661fe
Former-commit-id: 570bf42f89 [formerly b94dc3b045] [formerly 9e7fc0b82ae20bc6493ceddb6809f83261c06966 [formerly e3c3d55883]]
Former-commit-id: 731bb0268edd89c419ea3b8bb57b91ea5afc516a [formerly 25dd598b55]
Former-commit-id: 50fdb66cb4
|
2014-06-27 16:52:39 -05:00 |
|