Dave Hladky
|
cc7a9bce10
|
Issue #3168 Move retrieval distribution to correct DD RPM
Former-commit-id: 40c24180cf [formerly ca644b93ee ] [formerly 40c24180cf [formerly ca644b93ee ] [formerly 15366714ed [formerly 228ef1ceb7337fa38c370c3218d1c32b4f1302fb]]]
Former-commit-id: 15366714ed
Former-commit-id: f878ccb04e [formerly 268765da81 ]
Former-commit-id: 16a5eed943
|
2014-05-14 11:12:55 -05:00 |
|
Steve Harris
|
80d1cec3ec
|
Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
Former-commit-id: 462609aa3f [formerly c2efe26c11 ] [formerly 462609aa3f [formerly c2efe26c11 ] [formerly 70b95c7636 [formerly 2627e4d38b3dcee82dcf7a6032d692170d50d9ad]]]
Former-commit-id: 70b95c7636
Former-commit-id: 29ecfa91cb [formerly 667dff3919 ]
Former-commit-id: 292bb044a8
|
2014-05-13 15:23:57 -05:00 |
|
Brian.Dyke
|
4cedfadd77
|
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
Former-commit-id: 5a2e0c7e1b [formerly e95bc87a19 ] [formerly 5a2e0c7e1b [formerly e95bc87a19 ] [formerly fb4c7e55b3 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]]
Former-commit-id: fb4c7e55b3
Former-commit-id: f9474b087e [formerly 0311366ffb ]
Former-commit-id: 3b7a2f1645
|
2014-05-13 11:23:55 -04:00 |
|
Paul.Grell
|
4493e0608e
|
ASM #512 - Need radar data watchdog functionality
Change-Id: I3bcdbe8f267f78be1d0bc64e466ffed70be011a3
Former-commit-id: 0c8c5ef728 [formerly 9988804887 ] [formerly 0c8c5ef728 [formerly 9988804887 ] [formerly 7e036b2bbc [formerly ad727f0b3d820cf2310b4b8cc67639b6d141af6b]]]
Former-commit-id: 7e036b2bbc
Former-commit-id: 30dd189c72 [formerly c6aa190a43 ]
Former-commit-id: c741760dd2
|
2014-05-12 20:00:18 -04:00 |
|
Richard Peter
|
8ea97f96ac
|
Issue #2854: Fix merge of textdb
Change-Id: I626eabc72fbedde983e592ec0c8fb50ed1f52ae3
Former-commit-id: 559907c32d [formerly 1dc654c20e ] [formerly 559907c32d [formerly 1dc654c20e ] [formerly dd35516290 [formerly 2335691bb79c14d96e286f9b0be0f5085711c7bc]]]
Former-commit-id: dd35516290
Former-commit-id: d6805f94d3 [formerly 93520a29d3 ]
Former-commit-id: 2abb1ca090
|
2014-05-12 17:31:06 -05:00 |
|
Richard Peter
|
bb580d8e7c
|
Issue #2060: Consolidate grid indexes.
Change-Id: Ibc77133cd1b016ef85bae61e47e373a30e6e4d23
Former-commit-id: 50fb33488c [formerly 62e215eb89 ] [formerly 50fb33488c [formerly 62e215eb89 ] [formerly 6143d43329 [formerly 892c0f28a13d53118141efe14762deebe169d7ba]]]
Former-commit-id: 6143d43329
Former-commit-id: e2954e54db [formerly 32f7bd8735 ]
Former-commit-id: 28eb882fb6
|
2014-05-12 16:59:34 -05:00 |
|
Steve Harris
|
82045e2409
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: 848519177d [formerly cf62cf4a6e ] [formerly 848519177d [formerly cf62cf4a6e ] [formerly fc2bf6b45c [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: 32f255cada [formerly 233922471a ]
Former-commit-id: 74a325ce74
|
2014-05-12 16:13:19 -05:00 |
|
Juliya Dynina
|
3850e43354
|
Merge "ASM #539 - Multiple flag functionality for textdb is not working properly" into asm_14.3.1
Former-commit-id: 161d2039f7 [formerly a203a14e52 ] [formerly 161d2039f7 [formerly a203a14e52 ] [formerly 2578e13ee8 [formerly 3fcd47133ac461046524837f085359b5eb1c7ba7]]]
Former-commit-id: 2578e13ee8
Former-commit-id: f62a15f8e7 [formerly 212d220bf7 ]
Former-commit-id: 783fd63389
|
2014-05-12 14:52:50 -05:00 |
|
Kiran.Shrestha
|
3173d32583
|
ASM #539 - Multiple flag functionality for textdb is not working properly
Change-Id: I6f48e877a356fa576e1311da769c90735e61877f
Former-commit-id: d4970b6f2f [formerly e615e1efc5 ] [formerly d4970b6f2f [formerly e615e1efc5 ] [formerly c162868850 [formerly 2e2de40d75c0ebc0af1b2d70806e834c7d5089f8]]]
Former-commit-id: c162868850
Former-commit-id: d0ed79310a [formerly 943efbc9d0 ]
Former-commit-id: ce58e209b9
|
2014-05-12 15:16:14 -04:00 |
|
Ana Rivera
|
94ceb3698f
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: 7e74e047a0 [formerly 91715e7a3f ] [formerly 7e74e047a0 [formerly 91715e7a3f ] [formerly 81a9d4fa44 [formerly e71ef5db23122405fc6aab71526a9cc3ec3ad823]]]
Former-commit-id: 81a9d4fa44
Former-commit-id: e33c6e2d69 [formerly 88520fc206 ]
Former-commit-id: 8cb1bfc3b8
|
2014-05-12 18:55:06 +00:00 |
|
Brian.Dyke
|
464cc1a479
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3aa2f7974b [formerly 386ec058e1 ] [formerly 3aa2f7974b [formerly 386ec058e1 ] [formerly 41ba5fc348 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]
Former-commit-id: 41ba5fc348
Former-commit-id: dc5bc1d2a4 [formerly 2f704c898d ]
Former-commit-id: 82663c0ab6
|
2014-05-12 14:07:11 -04:00 |
|
Richard Peter
|
3e2b961103
|
Issue #3154: Remove stats reclaimSpace call
Change-Id: I32fb957e236f257e5d8164833d2d2c1adf1fa639
Former-commit-id: a077fd9cc6 [formerly fae9e811fb ] [formerly a077fd9cc6 [formerly fae9e811fb ] [formerly 5648e27bbc [formerly 4e35d1fa5e3e1ebaa5d177d95a5eb11741ae57d2]]]
Former-commit-id: 5648e27bbc
Former-commit-id: 87bb7ac342 [formerly f53d5ba7e9 ]
Former-commit-id: 6e42d24afe
|
2014-05-12 12:27:32 -05:00 |
|
Ben Steffensmeier
|
54487dede7
|
Issue #2289 Fix TempOfTe at small pressure values.
Former-commit-id: d051416c76 [formerly 2754326906 ] [formerly d051416c76 [formerly 2754326906 ] [formerly 102d560686 [formerly a114bf15018ab86ec1511c13704fd6e1e3feed99]]]
Former-commit-id: 102d560686
Former-commit-id: 763d8ef96f [formerly d55535c36c ]
Former-commit-id: 3290f7ee59
|
2014-05-12 10:11:34 -05:00 |
|
Juliya Dynina
|
b05e24f04d
|
Merge "ASM #551 - EDEX can decode some METAR peak wind fields as 6 hour min/max temperature" into asm_14.3.1
Former-commit-id: 72c7889020 [formerly ae025b5ef5 ] [formerly 72c7889020 [formerly ae025b5ef5 ] [formerly a6dfa2ce46 [formerly 7f7a086a5cb6ad94aac34973b028150021a616f0]]]
Former-commit-id: a6dfa2ce46
Former-commit-id: 2bdc898a1d [formerly 9acf0d8379 ]
Former-commit-id: 5126d52f5f
|
2014-05-12 09:58:14 -05:00 |
|
Juliya Dynina
|
3e6b57b785
|
Merge "ASM #515 - WarnGen product QC incorrectly reports UGC/area mismatch" into asm_14.3.1
Former-commit-id: 93834dac3e [formerly f9c2ef56a9 ] [formerly 93834dac3e [formerly f9c2ef56a9 ] [formerly 8bea01aa09 [formerly b8412f03c381032f90240af18f8175ab9b3a5a26]]]
Former-commit-id: 8bea01aa09
Former-commit-id: acfca250d0 [formerly 8b2558f383 ]
Former-commit-id: 36968a957d
|
2014-05-12 09:57:38 -05:00 |
|
David Friedman
|
5bd3b8d47a
|
ASM #551 - EDEX can decode some METAR peak wind fields as 6 hour min/max temperature
Change-Id: I1bf62b197f65073dc26356e9eb67d32f7f8ee45c
Former-commit-id: ad99a4f615 [formerly 3be74c3664 ] [formerly ad99a4f615 [formerly 3be74c3664 ] [formerly 20c7e2f29d [formerly 8d9e72c309cbcef7b0cd8656333e05202e0a290b]]]
Former-commit-id: 20c7e2f29d
Former-commit-id: 6384ea3833 [formerly 61b7c09d14 ]
Former-commit-id: 0275aa3f77
|
2014-05-12 13:18:50 +00:00 |
|
Nate Jensen
|
86913d088c
|
Merge "Issue #2928: Increase default thriftService byte limit to 250MB" into omaha_14.3.1
Former-commit-id: ed687984f7 [formerly 486c69045d ] [formerly ed687984f7 [formerly 486c69045d ] [formerly 5849925092 [formerly dac16ee8f25f6f265426405ca2bff55aff5b57ba]]]
Former-commit-id: 5849925092
Former-commit-id: b663cb9989 [formerly 9091c46153 ]
Former-commit-id: a82db1def6
|
2014-05-09 10:57:53 -05:00 |
|
Richard Peter
|
221d2553d5
|
Issue #2928: Increase default thriftService byte limit to 250MB
Change-Id: I8a55fbce410e1787946f2dd38b3a41c84aab20bd
Former-commit-id: b809ed50fd [formerly bd033db0f4 ] [formerly b809ed50fd [formerly bd033db0f4 ] [formerly acadd5b815 [formerly 1c5060d53524f195be7854ca66160d3d075c3112]]]
Former-commit-id: acadd5b815
Former-commit-id: 036909b7ac [formerly 67d637938e ]
Former-commit-id: f8a472f125
|
2014-05-09 10:37:18 -05:00 |
|
Kenneth Sperow
|
e99820dbe6
|
VLab Issue #3630. DR_17274 - Added basic logic to turn on the ability to purge all data -- core logic was already in place.
Change-Id: I65ee4724d381e51ef84444f9660592a7987814a4
Former-commit-id: ba6f9207c4 [formerly b16ead4581 ] [formerly ba6f9207c4 [formerly b16ead4581 ] [formerly 4c2bcadba0 [formerly b7d8b939bf224e80dd4df7817b2c109c778940ae]]]
Former-commit-id: 4c2bcadba0
Former-commit-id: a3e7be76c8 [formerly c00d96340f ]
Former-commit-id: 015373e18a
|
2014-05-09 08:04:25 -07:00 |
|
Qinglu.Lin
|
3ecdb059bc
|
ASM #515 - WarnGen product QC incorrectly reports UGC/area mismatch
Change-Id: I5ef8e83c826d3fb1d5ef72d5866f882d9c97e1f5
Former-commit-id: 58c036c80d [formerly 50967b199d ] [formerly 58c036c80d [formerly 50967b199d ] [formerly 9b49cc2464 [formerly 04597aac301d0001143f3f5ad3bcf5d128d33b86]]]
Former-commit-id: 9b49cc2464
Former-commit-id: 053e00ad25 [formerly 73300bc083 ]
Former-commit-id: 2313472d4a
|
2014-05-09 10:45:28 -04:00 |
|
Michael Gamazaychikov
|
7e5adc3edb
|
ASM #510 - textdb -pil -a command fails to add scripts with option
arguments.
Change-Id: I3f6c1c334db1100af0cb137f2f0a1a856564aaf4
Former-commit-id: 6497950f3d [formerly 97ec336416 ] [formerly 6497950f3d [formerly 97ec336416 ] [formerly c9df02db64 [formerly 77b054caca0aa54d51fa947a4a8aa041ef0cdcab]]]
Former-commit-id: c9df02db64
Former-commit-id: 34c44b6b8f [formerly f253b0ca13 ]
Former-commit-id: 02d0503b16
|
2014-05-09 14:45:27 +01:00 |
|
Gang.Zhang
|
6c46d5323e
|
ASM #589 - Fix FFMP Templates generation issue
Change-Id: Ia3715ccb03113f3d2528e516c2568255935f4086
Former-commit-id: fe742a06b9 [formerly f771c8fed4 ] [formerly fe742a06b9 [formerly f771c8fed4 ] [formerly 165b953b5c [formerly 560a3cc5ac5e9e059b581294e48e69a9978272e5]]]
Former-commit-id: 165b953b5c
Former-commit-id: b5622c5a5e [formerly c4b32db009 ]
Former-commit-id: 561169825f
|
2014-05-09 11:51:18 +01:00 |
|
Ana Rivera
|
d036ab76d7
|
VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b
Former-commit-id: e7fbea035f [formerly aac45623bc ] [formerly e7fbea035f [formerly aac45623bc ] [formerly 1b4450ec5f [formerly c5a4f22a24b6c1eced689c6ae437558a9a6cbc9e]]]
Former-commit-id: 1b4450ec5f
Former-commit-id: ebd4358495 [formerly 6a4fb7f0a3 ]
Former-commit-id: c150a7c8e1
|
2014-05-08 20:10:24 +00:00 |
|
Mike Duff
|
4adf657556
|
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: 0456fd0597 [formerly 8498235fd8 ] [formerly 0456fd0597 [formerly 8498235fd8 ] [formerly 6a67638a94 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]
Former-commit-id: 6a67638a94
Former-commit-id: f49192936a [formerly 70c8135fde ]
Former-commit-id: 916d90ee64
|
2014-05-08 14:36:54 -05:00 |
|
Ben Steffensmeier
|
a32bb9b996
|
Issue #3080 Fix NaN handling of SliceSample.
Former-commit-id: 3a87fa24df [formerly 0308147ad4 ] [formerly 3a87fa24df [formerly 0308147ad4 ] [formerly 1b6bdeac86 [formerly 9974018df428c84528cf98e9f868740accbabf58]]]
Former-commit-id: 1b6bdeac86
Former-commit-id: 7beb6429d4 [formerly 80a819f65b ]
Former-commit-id: c56d799865
|
2014-05-08 11:49:04 -05:00 |
|
Nate Jensen
|
e3d66c87ec
|
Merge "Issue #2726: Fix GeospatialDataGenerator NPE" into omaha_14.3.1
Former-commit-id: 3fdd5dbdd6 [formerly 8f8ac40c44 ] [formerly 3fdd5dbdd6 [formerly 8f8ac40c44 ] [formerly d4fef60be1 [formerly 34d2d296f304cd84a8105993803ca35c484c6b6e]]]
Former-commit-id: d4fef60be1
Former-commit-id: a50afc30eb [formerly 04e906f1a6 ]
Former-commit-id: 677e1662d7
|
2014-05-08 10:19:43 -05:00 |
|
Richard Peter
|
f5e8f07e8b
|
Issue #2726: Fix GeospatialDataGenerator NPE
Change-Id: I07213e17fcbbadea9a33471c390bb07472ba31e0
Former-commit-id: 5a7c78c009 [formerly 24539708f9 ] [formerly 5a7c78c009 [formerly 24539708f9 ] [formerly 4d99d25a55 [formerly fdc542df454887a48f4a55ef6ea9594ff98b3345]]]
Former-commit-id: 4d99d25a55
Former-commit-id: 3c21c1042f [formerly 29a8db5216 ]
Former-commit-id: 601f151a8b
|
2014-05-08 10:14:30 -05:00 |
|
Nate Jensen
|
4f18fe5173
|
Issue #2060 fix grid updates and performance
Change-Id: I0937d7360e456f08fb613be547f7b488ebe05b50
Former-commit-id: c71edb2d4c [formerly e39378e5f0 ] [formerly c71edb2d4c [formerly e39378e5f0 ] [formerly acfbce58d1 [formerly a430e85f283b3e41b8520d241f675eff3c6c32e3]]]
Former-commit-id: acfbce58d1
Former-commit-id: 81b914ad9f [formerly 5099fd6463 ]
Former-commit-id: f4bb539ae8
|
2014-05-07 15:30:13 -05:00 |
|
Dave Hladky
|
24a1a5a0c6
|
Issue #2940 More filenames printed, null from bad rec.
Former-commit-id: cd4921b35f [formerly a2ef100bfc ] [formerly cd4921b35f [formerly a2ef100bfc ] [formerly dadc604ab3 [formerly 26bfd426965d208f92bcb1fcd650b5f2299724a4]]]
Former-commit-id: dadc604ab3
Former-commit-id: e58fa39adc [formerly f54cbb83a1 ]
Former-commit-id: 07c49a82b5
|
2014-05-07 14:51:38 -05:00 |
|
Nate Jensen
|
6a620ffc04
|
Issue #2060 log successful sat precip file creation
Change-Id: I40df627645e0c0e089609f8dcc56b8351a4c56f1
Former-commit-id: 3c1f9693f2 [formerly f06c77f5ad ] [formerly 3c1f9693f2 [formerly f06c77f5ad ] [formerly 170106ad44 [formerly b3158ae940ab59a7a96b4650f0f956c82b0c9d49]]]
Former-commit-id: 170106ad44
Former-commit-id: 40b5e501a2 [formerly af426cf278 ]
Former-commit-id: 505b45ff22
|
2014-05-07 09:44:20 -05:00 |
|
Steve Harris
|
ab4d7cc569
|
Merge branch 'master_14.2.1' (14.2.1-23) into omaha_14.2.1
Former-commit-id: a7211a72f0 [formerly c3509757f0 ] [formerly a7211a72f0 [formerly c3509757f0 ] [formerly 0392577b6c [formerly 575adeb94784b32ac0d89e3c4dd506c2fe500266]]]
Former-commit-id: 0392577b6c
Former-commit-id: 8c5eb7774e [formerly 6694af2d5e ]
Former-commit-id: 7819c2878f
|
2014-05-07 08:45:41 -05:00 |
|
Nate Jensen
|
cf09a6729c
|
Issue #3101 fix some derived parameters on win64 platform
Change-Id: I9de1d31e7f7c19af437aef834aa84f163bf36d86
Former-commit-id: 49d34cc4e4 [formerly 5191b61b30 ] [formerly 49d34cc4e4 [formerly 5191b61b30 ] [formerly aa7c1fac90 [formerly 4659c0240aa31b615bc50228906d514f47a72f94]]]
Former-commit-id: aa7c1fac90
Former-commit-id: 815aa21d8e [formerly 8c1748d370 ]
Former-commit-id: b708774e64
|
2014-05-06 17:08:04 -05:00 |
|
Ron Anderson
|
2616943080
|
Issue #3129 Change smartInit back to 1 thread on 64-bit
Change-Id: Ie1e17e145d2d88485d91a29e4c74c737e4658038
Former-commit-id: 6c5f1a9ed3 [formerly b43e6d64c3 ] [formerly 6c5f1a9ed3 [formerly b43e6d64c3 ] [formerly 32c95e50a7 [formerly f2e15f4ab034f617a3a64814125dfee73b5070ac]]]
Former-commit-id: 32c95e50a7
Former-commit-id: 4a8b1296ea [formerly 85b86bd6e2 ]
Former-commit-id: cb6ed5a32c
|
2014-05-06 16:01:31 -05:00 |
|
Richard Peter
|
fc1f958e5b
|
Issue #2726: update smartInit threads to 1
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0
Former-commit-id: 884562700a [formerly 03ab7599de ] [formerly 884562700a [formerly 03ab7599de ] [formerly 611c010968 [formerly c12469d133558750e85049f7ce0f0a42b802c2b9]]]
Former-commit-id: 611c010968
Former-commit-id: be288505e0 [formerly 4f2d470801 ]
Former-commit-id: a03997122b
|
2014-05-06 15:54:23 -05:00 |
|
Ron Anderson
|
8d44fdcfb1
|
Issue #3118 Fix gridLocation issues with smartInit databases
Change-Id: I4660418234a5c721381c7986b793d9339c81c603
Former-commit-id: 93320d43c9 [formerly b4815af7f8 ] [formerly 93320d43c9 [formerly b4815af7f8 ] [formerly ba0c26edf6 [formerly a4a5522abbb439066acfa3567d0036cf044ef9c7]]]
Former-commit-id: ba0c26edf6
Former-commit-id: 03ac05ef4c [formerly b694dbe2e1 ]
Former-commit-id: 98c11671d2
|
2014-05-06 15:09:25 -05:00 |
|
Nate Jensen
|
17ddc5d8e5
|
Issue #2060 genericize DataURIFieldConverter
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4
Former-commit-id: 7701820902 [formerly ff6c77420c ] [formerly 7701820902 [formerly ff6c77420c ] [formerly 87b6df4840 [formerly 0a7265da59457e8dc6a122db81b134d6555d5276]]]
Former-commit-id: 87b6df4840
Former-commit-id: d1a040b9c2 [formerly a6363fc3d4 ]
Former-commit-id: 5f08921768
|
2014-05-06 13:10:48 -05:00 |
|
Nate Jensen
|
c8cc3b1b8e
|
Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1
Former-commit-id: d83fad0054 [formerly 0e3876de34 ] [formerly d83fad0054 [formerly 0e3876de34 ] [formerly 4f734ae7f9 [formerly c68f2924c4c7f998af859d7c88cd9d0049d636e5]]]
Former-commit-id: 4f734ae7f9
Former-commit-id: 732aaa6001 [formerly 044d086fc1 ]
Former-commit-id: 4db3b99181
|
2014-05-06 13:09:12 -05:00 |
|
Nate Jensen
|
ad7a69f2e3
|
Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 3719c41d2b [formerly 71b4227061 ] [formerly 3719c41d2b [formerly 71b4227061 ] [formerly 7cea97ab15 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]]
Former-commit-id: 7cea97ab15
Former-commit-id: 5bf1554597 [formerly 6bdbfb7e1a ]
Former-commit-id: 66cd43313a
|
2014-05-06 12:26:21 -05:00 |
|
Brian.Dyke
|
4f425f71e6
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 5461f75e41 [formerly 238e8f7ba1 ] [formerly 5461f75e41 [formerly 238e8f7ba1 ] [formerly e3b0b44b71 [formerly c6ba49e1206ed113b57a9fa39f5720ee9b3b979a]]]
Former-commit-id: e3b0b44b71
Former-commit-id: 430543e848 [formerly 43cc1d0b91 ]
Former-commit-id: fe9aeb1961
|
2014-05-06 11:34:46 -04:00 |
|
Chip Gobs
|
47068a7939
|
VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada
Former-commit-id: 4e4d00792d [formerly 65d2135ac2 ] [formerly 4e4d00792d [formerly 65d2135ac2 ] [formerly e42bef2a33 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]]
Former-commit-id: e42bef2a33
Former-commit-id: c075175e8e [formerly 593b36d722 ]
Former-commit-id: 1b7f762617
|
2014-05-06 10:48:35 -04:00 |
|
Richard Peter
|
4f6a9a0562
|
Issue #2726: Autoset route startup order.
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc
Former-commit-id: 8ae9cfba55 [formerly b148d11ec9 ] [formerly 8ae9cfba55 [formerly b148d11ec9 ] [formerly 4dc91f494f [formerly 9b9d2b475f4777febf125e4013cba0d971eaf8e8]]]
Former-commit-id: 4dc91f494f
Former-commit-id: 7fe7b43ee2 [formerly c6719da76b ]
Former-commit-id: 4a140afac6
|
2014-05-06 09:46:41 -05:00 |
|
Melissa Porricel
|
9b7d84bfc4
|
ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca
Former-commit-id: a91a4ed137 [formerly 42c36a5e80 ] [formerly a91a4ed137 [formerly 42c36a5e80 ] [formerly 92231e051d [formerly 012fa438f085498027402c1cd0897dd13c0d4edc]]]
Former-commit-id: 92231e051d
Former-commit-id: 6749967b5b [formerly 1e32d583b4 ]
Former-commit-id: 38539cc805
|
2014-05-05 14:56:58 -04:00 |
|
Nate Jensen
|
d50f19d715
|
Issue #2060 fix sat precip for grid data URI removal
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58
Former-commit-id: 2b6c30e67d [formerly 0cf0f724f4 ] [formerly 2b6c30e67d [formerly 0cf0f724f4 ] [formerly d82f6e5ff6 [formerly cf0bb31583f0ec0b2135aa9101f3247e88e877d0]]]
Former-commit-id: d82f6e5ff6
Former-commit-id: 09091ccf25 [formerly 97597c3ab1 ]
Former-commit-id: 0840a62eb8
|
2014-05-05 13:06:08 -05:00 |
|
Dave Hladky
|
7e763a5a22
|
Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
Former-commit-id: 0ac4de6ad0 [formerly 333bf8b36d ] [formerly 0ac4de6ad0 [formerly 333bf8b36d ] [formerly ccaaa1cfea [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: 93ca9cfe6a [formerly 7611339cd8 ]
Former-commit-id: cb94f9fc97
|
2014-05-05 12:15:14 -05:00 |
|
Steve Harris
|
4fe84ba0fd
|
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: 9e149df799 [formerly 6ef3b9f1e5 ] [formerly 9e149df799 [formerly 6ef3b9f1e5 ] [formerly 1c8f2f6185 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 927a87b126 [formerly b797b4b1fa ]
Former-commit-id: 17318b1870
|
2014-05-05 08:21:02 -05:00 |
|
Xuezhi.Wei
|
02e31e37f6
|
ASM #579 Shef Ingest ProcessUtil configuration update
Change-Id: Idc121a2b4b303e53ac2f9a7fc0dc2cb045b08150
Former-commit-id: b017e1c390 [formerly fb359316c8 ] [formerly b017e1c390 [formerly fb359316c8 ] [formerly e3b1ee759d [formerly ddda775e85dd8cba5f4342de330d1446647c621c]]]
Former-commit-id: e3b1ee759d
Former-commit-id: 4fcbc99209 [formerly 454b3acb5c ]
Former-commit-id: 627a1aa6d8
|
2014-05-02 19:48:55 +00:00 |
|
Shawn.Hooper
|
66e0a8cb74
|
ASM #131 - Additional fix for Lightning Data Decoder
Change-Id: I014a5ce61e495c2339f17ef22f706a3ad1a1ee72
Former-commit-id: faa9f20f84 [formerly 76d4a7ac73 ] [formerly faa9f20f84 [formerly 76d4a7ac73 ] [formerly d80a278cb7 [formerly 4bada72eef85bf38522b40526643ebd8bddc9005]]]
Former-commit-id: d80a278cb7
Former-commit-id: 98631b46c8 [formerly b5b0c01eb9 ]
Former-commit-id: a58a5e95da
|
2014-05-02 12:48:18 -04:00 |
|
Richard Peter
|
9326b9d125
|
Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
Former-commit-id: f38816d168 [formerly dc0b598fd4 ] [formerly f38816d168 [formerly dc0b598fd4 ] [formerly 132d63ac44 [formerly 28b33188773001c34946464093319dc2a1117be9]]]
Former-commit-id: 132d63ac44
Former-commit-id: 8e141a137a [formerly 5314b412b4 ]
Former-commit-id: b9351199b8
|
2014-05-02 10:05:59 -05:00 |
|
Ben Steffensmeier
|
dd315aa9b8
|
Issue #3095 Update JGridData for creation of numeric java package.
Former-commit-id: 956f62a6ec [formerly 6bdaba048c ] [formerly 956f62a6ec [formerly 6bdaba048c ] [formerly 23d6da4a18 [formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]]
Former-commit-id: 23d6da4a18
Former-commit-id: d2c0499f2c [formerly 3300d8c75c ]
Former-commit-id: c2a3dbe9af
|
2014-05-01 18:02:08 -05:00 |
|
brian.dyke
|
22ffaef982
|
Merge branch 'master_14.3.1-3' into asm_14.3.1
Former-commit-id: 2a934def82 [formerly 5d7b8eca6a ] [formerly 2a934def82 [formerly 5d7b8eca6a ] [formerly d5c3f112c1 [formerly c31c7837568ec4a8fd1516a9e9cd115df30cee40]]]
Former-commit-id: d5c3f112c1
Former-commit-id: b68c49053a [formerly 302366dac1 ]
Former-commit-id: b72e2d4289
|
2014-05-01 15:20:36 -04:00 |
|