Brian Clements
|
6a9f323dc0
|
Issue #2903 changed collaboration jaxb xml to be base64 encoded
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c
Former-commit-id: 89a5679714 [formerly 909561d871] [formerly 5424eb0258] [formerly 89a5679714 [formerly 909561d871] [formerly 5424eb0258] [formerly ef0ecfd1d4 [formerly 5424eb0258 [formerly afcfdf1ed08cd64deb085b909f0965e4ab68d92d]]]]
Former-commit-id: ef0ecfd1d4
Former-commit-id: b6232bbe1f [formerly 077976c912] [formerly 8512eec3b1257faf9bbe8ce48adddd95718600b1 [formerly 9e39c19a7d]]
Former-commit-id: f3e969013d91de867a66a8a214bde6496e5d096f [formerly 649d0cf43f]
Former-commit-id: 88bc3a948e
|
2014-06-12 13:40:33 -05:00 |
|
Nate Jensen
|
96ad173d73
|
Merge "Omaha #3269 - Fix editing of Notifiers before saving Amend - Remove save confirmation dialog, rename buttons" into omaha_14.4.1
Former-commit-id: 57366a56b7 [formerly cd10372371] [formerly 4ac8246386] [formerly 57366a56b7 [formerly cd10372371] [formerly 4ac8246386] [formerly f118e1b0e9 [formerly 4ac8246386 [formerly 88280dedea4b6065a5603ac26e982eab0a2e0e72]]]]
Former-commit-id: f118e1b0e9
Former-commit-id: ef22cb0a1c [formerly 595cb870bf] [formerly 529a3173a751bf6b0faf7200e920ce33539fba16 [formerly 343b88e3b3]]
Former-commit-id: 2cd350ed0521d1c315fc52250fc080ae60e30c44 [formerly 576fc405e5]
Former-commit-id: 20d48d21f6
|
2014-06-12 12:36:14 -05:00 |
|
Richard Peter
|
2dbe36738e
|
Merge "Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200)." into omaha_14.4.1
Former-commit-id: f45f556de5 [formerly f4cd1ce52d] [formerly df86770b4e] [formerly f45f556de5 [formerly f4cd1ce52d] [formerly df86770b4e] [formerly 7731e25983 [formerly df86770b4e [formerly 3285557835e929a6b7048f4445d1da45ae8e1325]]]]
Former-commit-id: 7731e25983
Former-commit-id: 05e68f1a7e [formerly 0ef48baedc] [formerly 8c362ad8efcec56b0dbc19db008393d687ac2040 [formerly 40e2813f50]]
Former-commit-id: bf84c5a4dc8a658b08dbe38cb367a7e928135daa [formerly 52b9f0107f]
Former-commit-id: 8f55fcab69
|
2014-06-12 12:35:24 -05:00 |
|
Nate Jensen
|
4b0575e6f4
|
Omaha #3247 upgrade build.cave's xalan jar
Change-Id: Idd4e0d583ef4ad91bcde99278e3e035f1f12e434
Former-commit-id: b19785409f [formerly 1a94d51831] [formerly d4471bf759] [formerly b19785409f [formerly 1a94d51831] [formerly d4471bf759] [formerly 95fe41966a [formerly d4471bf759 [formerly c2d32dddb2bba04b46099d8745ff541989e1a281]]]]
Former-commit-id: 95fe41966a
Former-commit-id: d8fb659d3e [formerly 08b53fe0fe] [formerly 742e659e07d4715632082d2607cfa0cbb343649e [formerly a6fa27a1b8]]
Former-commit-id: fb4eb629a6ea9c6fbc160bc4a8221664b7928424 [formerly 7fac05ac42]
Former-commit-id: 6f25339365
|
2014-06-12 11:38:22 -05:00 |
|
Slav Korolev
|
0054792657
|
Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 104a9361e6 [formerly 8175aad0bf] [formerly 2b877529ce] [formerly 104a9361e6 [formerly 8175aad0bf] [formerly 2b877529ce] [formerly 16ec392c12 [formerly 2b877529ce [formerly 0172e8f27b646a965e472f969f112a4e170d9f41]]]]
Former-commit-id: 16ec392c12
Former-commit-id: d7ae30d41d [formerly fec8eb4fae] [formerly a0eae9f9cf976b1aa053ca469ff8139bb458fcff [formerly d8ebeb4778]]
Former-commit-id: 36c4c96d47278b9595ec9faab709f3e5c6b59ee9 [formerly a66dd879c7]
Former-commit-id: d6ef83e619
|
2014-06-12 12:24:34 -04:00 |
|
Mike Duff
|
03dea47a31
|
Omaha #3269 - Fix editing of Notifiers before saving
Amend - Remove save confirmation dialog, rename buttons
Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4
Former-commit-id: 9ecb9c413f [formerly 522d3c70f2] [formerly 80922824a3] [formerly 9ecb9c413f [formerly 522d3c70f2] [formerly 80922824a3] [formerly c920a24300 [formerly 80922824a3 [formerly 47d57692c81757a8b8c0d3217e21f701f18cdf2c]]]]
Former-commit-id: c920a24300
Former-commit-id: 2b2b3c266c [formerly 0bdefaabdd] [formerly f350810f0a7ebafd0d7711f6b99ab4c1683573c5 [formerly b15b6514fd]]
Former-commit-id: 065d66e16f596dc5c644abeda291d4875dffd692 [formerly 5e0aa25048]
Former-commit-id: a87ac48a53
|
2014-06-12 11:21:15 -05:00 |
|
Roger Ferrel
|
49c1d502db
|
Omaha #3252 Fix bug in __makeHader to prevent unexpected exception.
Former-commit-id: a961faca0d [formerly 09ae36d8de] [formerly 960772ea44] [formerly a961faca0d [formerly 09ae36d8de] [formerly 960772ea44] [formerly 42fe1bf5b2 [formerly 960772ea44 [formerly 787261f13c47b5de81b2e7c4f861645614a11f1f]]]]
Former-commit-id: 42fe1bf5b2
Former-commit-id: 8071e5f75f [formerly c43758bdbb] [formerly 1b61807ee6ec798bcfcc7b443f172268d2f0bc0a [formerly 95d7540d05]]
Former-commit-id: 19e5b0b0324c00092520c790507df047e0ba4947 [formerly 5e9ed74eac]
Former-commit-id: 06808134bf
|
2014-06-12 10:08:51 -05:00 |
|
Ben Steffensmeier
|
55b8bd7e04
|
Omaha #3217 Add always prompt option to thinclient connectivity dialog.
Former-commit-id: 06cc84dfe9 [formerly 13e618cf89] [formerly b8f331bfba] [formerly 06cc84dfe9 [formerly 13e618cf89] [formerly b8f331bfba] [formerly c70462fb8a [formerly b8f331bfba [formerly aac3fdd00b429932d9cfa5d950f9729ace54a933]]]]
Former-commit-id: c70462fb8a
Former-commit-id: 8001a3bbaf [formerly 726c91ed9e] [formerly e792dad5a95c9536e993f91e49e9b15b0c5fb948 [formerly 96591c2ddb]]
Former-commit-id: 087db6f69952c73c42477ebba3dd3512884f073b [formerly f6ea37ef66]
Former-commit-id: 993da07002
|
2014-06-11 17:00:16 -05:00 |
|
Ben Steffensmeier
|
ed865c330a
|
Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: db668f8b63 [formerly 5a4f7a1fd4] [formerly f292f204c9] [formerly db668f8b63 [formerly 5a4f7a1fd4] [formerly f292f204c9] [formerly fc25774506 [formerly f292f204c9 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]]]
Former-commit-id: fc25774506
Former-commit-id: c9b474afb9 [formerly 217734a2ba] [formerly f401961b28b14a7264ad7debe15758c82f45e504 [formerly 94b465fa15]]
Former-commit-id: 0558994679c2da78da91ba8ad2e4c69c953ea5d5 [formerly 3c8b94e08a]
Former-commit-id: 2aebff4f06
|
2014-06-11 13:45:42 -05:00 |
|
Nate Jensen
|
d80c1e46b8
|
Merge "Omaha #3266 remove unused attributes and elements from baseline menu xml files" into omaha_14.4.1
Former-commit-id: 5f28268f37 [formerly 17456be16c] [formerly 04a6c1d5b7] [formerly 5f28268f37 [formerly 17456be16c] [formerly 04a6c1d5b7] [formerly 4354bac2d5 [formerly 04a6c1d5b7 [formerly b97df26a25976d58409dad8e43b1ca3ce7471133]]]]
Former-commit-id: 4354bac2d5
Former-commit-id: d7ac75bdd7 [formerly d6e35301cf] [formerly 09b22843ea388a2423d432792bdd2afa25394dcd [formerly 753b7ddd5c]]
Former-commit-id: 17661541c281707bfe55872cae83d3f24b1b3913 [formerly 717523bf0e]
Former-commit-id: aa25da74a0
|
2014-06-11 13:09:34 -05:00 |
|
Ben Steffensmeier
|
f4319b5920
|
Omaha #2061 Remove IDecoderGettable from all AWIPS2 Raytheon PDOs.
Former-commit-id: 257cfe8bd3 [formerly a96199cc47] [formerly d838ecc734] [formerly 257cfe8bd3 [formerly a96199cc47] [formerly d838ecc734] [formerly 30415ae8c5 [formerly d838ecc734 [formerly b6c63e5791a2438253d6ff039b5164c61105a941]]]]
Former-commit-id: 30415ae8c5
Former-commit-id: 1210c094d7 [formerly 08a1e07918] [formerly c6abdf4a8300c5eb3d9c3950d871d79698655d9a [formerly eb7cf7e8da]]
Former-commit-id: e02af9791372650c46525cb594c1dd112707a9c1 [formerly 02c4332c6a]
Former-commit-id: 3db0af5561
|
2014-06-11 12:38:35 -05:00 |
|
David Friedman
|
b373fea52f
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: 350566a514 [formerly 6d0d3f5ba5] [formerly b8542c1332] [formerly 350566a514 [formerly 6d0d3f5ba5] [formerly b8542c1332] [formerly 1c84c31e30 [formerly b8542c1332 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]]]]
Former-commit-id: 1c84c31e30
Former-commit-id: 5d2dcfe9c8 [formerly 0ba91c6c28] [formerly 2134244bb7c5f6877ba479473585ac3ff2a3cceb [formerly 8c8f54994b]]
Former-commit-id: 84d4ad89f719f3725ff0576bdad2b7cdfef1cdd6 [formerly d50646b479]
Former-commit-id: 3b686ca052
|
2014-06-11 13:37:16 +00:00 |
|
Nate Jensen
|
2e96094926
|
Omaha #3266 remove unused attributes and elements from baseline menu xml
files
Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01
Former-commit-id: 7783919a76 [formerly 23f3a15f31] [formerly 205e491d71] [formerly 7783919a76 [formerly 23f3a15f31] [formerly 205e491d71] [formerly 955e115c00 [formerly 205e491d71 [formerly 797504a970ec39c4fd56c9e0d51b292acfceea1b]]]]
Former-commit-id: 955e115c00
Former-commit-id: 090e92c5a9 [formerly f9d4da37b1] [formerly e7972d10e8e9f8d2d57b2115e4f5431b97c32a6a [formerly f634182937]]
Former-commit-id: 656899700d1a93fd86eeabfea200d00c94ba1839 [formerly 70589056d1]
Former-commit-id: fa9e075a44
|
2014-06-10 18:30:14 -05:00 |
|
Nate Jensen
|
39fa380edd
|
Merge "Omaha #2061 Delete PlotResource, rename PlotResource2." into omaha_14.4.1
Former-commit-id: 029d18dd12 [formerly be169a7f63] [formerly 6890ee0920] [formerly 029d18dd12 [formerly be169a7f63] [formerly 6890ee0920] [formerly 10207907d8 [formerly 6890ee0920 [formerly b0903898a40916383f88b920e87dfc072d9cafa9]]]]
Former-commit-id: 10207907d8
Former-commit-id: 997128e6c5 [formerly 789d9be951] [formerly bc9e5521a3d6cf145c8cd6387d58c9b66089aa58 [formerly 33b22ece81]]
Former-commit-id: ac15331a226f90e62e1d896583f8e26ff9a37fe5 [formerly 57f48654ac]
Former-commit-id: f5c593071a
|
2014-06-10 17:14:53 -05:00 |
|
Ben Steffensmeier
|
82f3aaa41e
|
Omaha #3263 Synchronize dataTimes of storm track resources.
Former-commit-id: e7128150f9 [formerly 8783e9e23c] [formerly eff1921f70] [formerly e7128150f9 [formerly 8783e9e23c] [formerly eff1921f70] [formerly cad15768cc [formerly eff1921f70 [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]]]]
Former-commit-id: cad15768cc
Former-commit-id: 814cabbcfc [formerly e4ac81c0e9] [formerly 0968abe7b80aa03d6d67b8c88ad9529a151531f3 [formerly b02383f878]]
Former-commit-id: f97a310ca82b1a763f344ac25119445501694a5b [formerly f60667703f]
Former-commit-id: c0b8a49ee9
|
2014-06-10 16:34:44 -05:00 |
|
Ben Steffensmeier
|
e0d3a7d6d9
|
Omaha #2061 Delete PlotResource, rename PlotResource2.
Former-commit-id: 1191aa9adf [formerly bcc7243358] [formerly 1e37d669d8] [formerly 1191aa9adf [formerly bcc7243358] [formerly 1e37d669d8] [formerly a98872cb89 [formerly 1e37d669d8 [formerly b569c7c3e175ed1519576aea63048c3f675d3875]]]]
Former-commit-id: a98872cb89
Former-commit-id: ec7c42dd48 [formerly bbcec7c004] [formerly 12e70d14ff5c3857021a22734b1090ee010e2a95 [formerly d40c6fd625]]
Former-commit-id: a44da7daa093da279e8400476e0f40922dd35b74 [formerly 6a5b6dcf8e]
Former-commit-id: 178b7509db
|
2014-06-10 15:59:15 -05:00 |
|
Brian.Dyke
|
f5befd7116
|
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 7056d79f70 [formerly 0f07e14bf1] [formerly f72380ad60] [formerly 7056d79f70 [formerly 0f07e14bf1] [formerly f72380ad60] [formerly 9ab17ddecb [formerly f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 5893782ec3 [formerly 816dcf74e4] [formerly d838e1972c1a8529e2efc996d44a235ce685e8db [formerly 49cd9574d9]]
Former-commit-id: b46938d836881d648f671f55d48408d36e6cb22f [formerly a4b39dfca5]
Former-commit-id: 1ae1410e46
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
7caa757318
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: 64a10ce12d [formerly ef5c74dece] [formerly c1b3f9d180] [formerly 64a10ce12d [formerly ef5c74dece] [formerly c1b3f9d180] [formerly 8874d41872 [formerly c1b3f9d180 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]]
Former-commit-id: 8874d41872
Former-commit-id: d6ebcad87e [formerly 4f0fc67b1f] [formerly c763da54d370b72fa17bd0154f839ff80cd9226a [formerly f568b5606a]]
Former-commit-id: cb4c4f5cdbcafd5e7f18339757c3484f03c17e30 [formerly 81d732477e]
Former-commit-id: a39afc1dfa
|
2014-06-10 12:52:59 -04:00 |
|
Nate Jensen
|
2528701f55
|
Merge "Omaha #3226 added total lightning decoder" into omaha_14.4.1
Former-commit-id: 72890cee17 [formerly a8022b8363] [formerly c8b6324240] [formerly 72890cee17 [formerly a8022b8363] [formerly c8b6324240] [formerly 19bef8d080 [formerly c8b6324240 [formerly ffa3e069c0beb5678ecb863b2950556d8c289ae1]]]]
Former-commit-id: 19bef8d080
Former-commit-id: 71a091b896 [formerly 87abeb25b9] [formerly 877785bfca1f4a6501e488fc91209f596d9b6209 [formerly 1d619bcf95]]
Former-commit-id: 42625f1b7dd60707c695d97778ea45d509e40667 [formerly 17e3c5f898]
Former-commit-id: 4299caf439
|
2014-06-09 09:38:50 -05:00 |
|
Mike Duff
|
f1dd41a042
|
ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing.
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1
Former-commit-id: b2162559fe [formerly b876d9755a] [formerly 81ab64d7ff] [formerly b2162559fe [formerly b876d9755a] [formerly 81ab64d7ff] [formerly 39173c380c [formerly 81ab64d7ff [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]]]]
Former-commit-id: 39173c380c
Former-commit-id: 7316895b98 [formerly 60fe02137f] [formerly 218dced89f74bad34c2dfce78c1142304822bd73 [formerly b880d171d4]]
Former-commit-id: f76ab4fcf17730eb720be95ca87a67c136734004 [formerly 4b9f707a06]
Former-commit-id: bb122607cc
|
2014-06-06 16:03:14 -04:00 |
|
Brian Clements
|
fd580e44c7
|
Omaha #3226 added total lightning decoder
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning
Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3
Former-commit-id: eb782b8201 [formerly 2e445986e2] [formerly c278000764] [formerly eb782b8201 [formerly 2e445986e2] [formerly c278000764] [formerly f39896b2d1 [formerly c278000764 [formerly e2583481a77d08249030838ebd52eed6e54b2986]]]]
Former-commit-id: f39896b2d1
Former-commit-id: 04bd60be1d [formerly 77b1f85fe1] [formerly 7f4d763d46a3bdf042a5574c4aafc88355d20fd6 [formerly b98a3494fe]]
Former-commit-id: 57e3fc0a6ae1a95a9441bff9f250f3224caa7782 [formerly ca1b869647]
Former-commit-id: 8046cbc417
|
2014-06-06 14:39:57 -05:00 |
|
Nate Jensen
|
6b835dc3cb
|
Merge "Omaha #3232 Radar code improvements." into omaha_14.4.1
Former-commit-id: 4dbf0be26c [formerly 5e9faea6e7] [formerly 3b324093ae] [formerly 4dbf0be26c [formerly 5e9faea6e7] [formerly 3b324093ae] [formerly 920e53628b [formerly 3b324093ae [formerly 22a5da1feff7e30ea0408f089305d95657befad2]]]]
Former-commit-id: 920e53628b
Former-commit-id: 16461f7204 [formerly f2d753fa64] [formerly 3359ee9c8061b5996314083928ff3cee94ee634a [formerly c0f047b24f]]
Former-commit-id: 760f4e543af4ad84e3fd2053a243af7a6973ac2f [formerly 24f7247805]
Former-commit-id: 10350a1337
|
2014-06-05 17:38:32 -05:00 |
|
Ben Steffensmeier
|
6dd09f3b8d
|
Omaha #3232 Radar code improvements.
Former-commit-id: d2587a7d57 [formerly 3eb6b79c56] [formerly 8587b9b43b] [formerly d2587a7d57 [formerly 3eb6b79c56] [formerly 8587b9b43b] [formerly 26325b57be [formerly 8587b9b43b [formerly 696f45d67c5e5b02183f97cfcc139db017f01848]]]]
Former-commit-id: 26325b57be
Former-commit-id: cdd8eb2d9e [formerly 4f83edfa72] [formerly a96d770a2e60482e10653300e2065d1100acb73d [formerly b8fe181c9a]]
Former-commit-id: fe8e7c1d08bafbe62409a3a17d56f49166d9b87c [formerly 9e97750df2]
Former-commit-id: dc5a927bb8
|
2014-06-05 14:53:25 -05:00 |
|
Michael Gamazaychikov
|
b3afeb981b
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: efd0fb50b8 [formerly e5a9fa0827] [formerly c07bcacbf8] [formerly efd0fb50b8 [formerly e5a9fa0827] [formerly c07bcacbf8] [formerly 50ab77046b [formerly c07bcacbf8 [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]]
Former-commit-id: 50ab77046b
Former-commit-id: fc5acb6bcb [formerly a2423cfadc] [formerly a99f478987db9b40c18652f3f209154a8dfc3177 [formerly 5efb82ea3e]]
Former-commit-id: 177375df5384d0a8fa51c23b24915e671ade7ce1 [formerly 29e197404f]
Former-commit-id: 94595e6af4
|
2014-06-05 13:43:04 +01:00 |
|
Roger Ferrel
|
941e79020b
|
Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data.
Change-Id: Ide97fbfd93bf06a6d708bf6fbd74349000ba2ed5
Former-commit-id: cb5070f384 [formerly 7510cc23af] [formerly e1c011b157] [formerly cb5070f384 [formerly 7510cc23af] [formerly e1c011b157] [formerly 10e7a33f08 [formerly e1c011b157 [formerly 3e976b7ed5cf46687bbb76073e53f35ffc2c2812]]]]
Former-commit-id: 10e7a33f08
Former-commit-id: 48dd32b752 [formerly e799ce4c59] [formerly e5bd21828e3c3092ef9dcb90f6991be60f99b48d [formerly aa085d9e59]]
Former-commit-id: 9eefab3c342160e3dcf89f23c7d7c9b414c299b8 [formerly 050c2e87e7]
Former-commit-id: b575bb7de2
|
2014-06-04 08:14:06 -05:00 |
|
Brian.Dyke
|
f8fec394e1
|
Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: a91c426ee7 [formerly feb26ee9b7] [formerly 61b206be0b] [formerly a91c426ee7 [formerly feb26ee9b7] [formerly 61b206be0b] [formerly 3919c9ec2f [formerly 61b206be0b [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]]]
Former-commit-id: 3919c9ec2f
Former-commit-id: 7d8dd856bd [formerly 8f6e365ece] [formerly f5c80b02fc2a80a424af9d583f9c067a6dab9c12 [formerly 244467210c]]
Former-commit-id: a57e4cdd13c530f19a214cf1874aa117dbeb8728 [formerly 75c6886f61]
Former-commit-id: cdbcdb6cbd
|
2014-06-04 07:46:16 -04:00 |
|
Kenneth Sperow
|
17b05cb9d9
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8
Former-commit-id: 764ffeb440 [formerly a59743ebe0] [formerly c302ef8967] [formerly 764ffeb440 [formerly a59743ebe0] [formerly c302ef8967] [formerly f2a738cc25 [formerly c302ef8967 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]]]
Former-commit-id: f2a738cc25
Former-commit-id: be5c7616f5 [formerly 1ba5f0a3c4] [formerly f37bc3930eb01b1551e48a86cb29ce5ebd4ca434 [formerly ca913b6159]]
Former-commit-id: c8835c1e57e17265888c244565b0ad22c4fe3c23 [formerly 3e94502542]
Former-commit-id: ca67a59e23
|
2014-06-03 20:55:29 -07:00 |
|
brian.dyke
|
2162f16b51
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 17eb7729c7 [formerly 789482b0e3] [formerly 79f866fb17] [formerly 17eb7729c7 [formerly 789482b0e3] [formerly 79f866fb17] [formerly b3d95ca18d [formerly 79f866fb17 [formerly 2d4751c000176447d28b284337fb23a60cb19cd1]]]]
Former-commit-id: b3d95ca18d
Former-commit-id: cabd43daf1 [formerly 05dfb0b2a5] [formerly 7ad9171a6cdb412defa9850b769ed5db070cb4ae [formerly 76cbdf64ff]]
Former-commit-id: b510f79b2731169c7c5a3c97d2ccf94a36652acc [formerly 21721fd935]
Former-commit-id: 65f4a41200
|
2014-06-03 16:14:16 -04:00 |
|
Ben Steffensmeier
|
6a9568162c
|
Omaha #3163 Fix collaboration string differencing
Former-commit-id: 6e70040ee2 [formerly 2c534e177e] [formerly ca2210b3e7] [formerly 6e70040ee2 [formerly 2c534e177e] [formerly ca2210b3e7] [formerly 310e6562e6 [formerly ca2210b3e7 [formerly e6f30c822de26bafae339a8871c4ba98100e6d1a]]]]
Former-commit-id: 310e6562e6
Former-commit-id: 3ebd687ef6 [formerly 2b82c39a59] [formerly 3ade28600af95cf3d306987c41b0f340bb4a9ddd [formerly 72f1d7c950]]
Former-commit-id: 15110978aad7a1d308063e620f5b3f2ae1951641 [formerly b40e97f5ac]
Former-commit-id: f403929612
|
2014-06-03 13:51:46 -05:00 |
|
Zhidong.Hao
|
e842be1d53
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 43e1a5a909 [formerly ccbda4db4f] [formerly 26c6801620] [formerly 43e1a5a909 [formerly ccbda4db4f] [formerly 26c6801620] [formerly 71ab6b9ed0 [formerly 26c6801620 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]]]
Former-commit-id: 71ab6b9ed0
Former-commit-id: 460b543c6d [formerly 9094e822e0] [formerly c17aa2176430d3a612529390ab4b68f86ac03181 [formerly e5c47a51eb]]
Former-commit-id: 16d700e0af2365b3ff5388b53260c131a361d620 [formerly 3a9abec04b]
Former-commit-id: 33086a8085
|
2014-06-03 11:55:32 -04:00 |
|
Ron Anderson
|
492d3fce39
|
Omaha #3052 Improved TopoQuery error handling to throw exceptions with useful error messages.
Change-Id: Ic181682611801ea244b986e8a2ce1400c4dc15d1
Former-commit-id: 49d4eba710 [formerly bd50ae9854] [formerly 3f169399b8] [formerly 49d4eba710 [formerly bd50ae9854] [formerly 3f169399b8] [formerly 304364e356 [formerly 3f169399b8 [formerly 0d42d4fdc56122c3df912c93e5e09b0ab28c1b37]]]]
Former-commit-id: 304364e356
Former-commit-id: 9b0c3f2355 [formerly 060b0221fa] [formerly bba329f4d5727f79bd95b57a11fd41ca3994a509 [formerly 3ff441f9da]]
Former-commit-id: 0d5de25d2e6c39b305e848012322ce2570f429ed [formerly 7171bc6f0a]
Former-commit-id: b98936356f
|
2014-06-02 17:14:18 -05:00 |
|
Nate Jensen
|
e344f4e70b
|
Merge "Omaha #2918 Synchronize mosaic dataTimes." into omaha_14.4.1
Former-commit-id: 8fa99462e6 [formerly 4be10cf1e6] [formerly d94a040f29] [formerly 8fa99462e6 [formerly 4be10cf1e6] [formerly d94a040f29] [formerly a862846e15 [formerly d94a040f29 [formerly 4abb30354ef4f6c6520ee993a66371656db0db9f]]]]
Former-commit-id: a862846e15
Former-commit-id: 36266f1d8f [formerly 711661870f] [formerly e40e41702ed68ec295277570a93d814c4d06cd99 [formerly 1f4daca6e3]]
Former-commit-id: be6975c458e64c7d3a5750944272f6e4145bd715 [formerly ba546c3001]
Former-commit-id: cf3a5b9a53
|
2014-06-02 12:44:17 -05:00 |
|
Steve Harris
|
cbd6f7c310
|
Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/esb/conf/modes.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
Former-commit-id: 2b95865dec [formerly 647cd97e29] [formerly 7fec0d039c] [formerly 2b95865dec [formerly 647cd97e29] [formerly 7fec0d039c] [formerly 455eb8b39d [formerly 7fec0d039c [formerly 45250149681f057cf168f4d3cb27276279f62c05]]]]
Former-commit-id: 455eb8b39d
Former-commit-id: b1f34a5dd0 [formerly 373c816e6a] [formerly c52c0623361b5124ad656838a838096ff392d903 [formerly ec743199f1]]
Former-commit-id: 7d167287b3c5d094c77e241af01ad8945f4a9c0b [formerly cbceb4ea62]
Former-commit-id: 7eabeb7ad6
|
2014-06-02 11:21:46 -05:00 |
|
Ben Steffensmeier
|
eb45b78812
|
Omaha #2918 Synchronize mosaic dataTimes.
Former-commit-id: 8aff2fc4a1 [formerly 93ce7ddb33] [formerly 8a117864d8] [formerly 8aff2fc4a1 [formerly 93ce7ddb33] [formerly 8a117864d8] [formerly b078baf67d [formerly 8a117864d8 [formerly c4d8ed9d0d7eb4c17d8a0922302a3fc50a0ae383]]]]
Former-commit-id: b078baf67d
Former-commit-id: 669c4e0745 [formerly a97f9cd7e6] [formerly cbd57f8d6748ba12892e46cd85d33d887aa145c9 [formerly b4e1a98e23]]
Former-commit-id: c5d60e84cf3fe1eb4e53e28f3cca0abf7736b7e2 [formerly cbe8c64e73]
Former-commit-id: 25b2aeeed2
|
2014-06-02 10:41:45 -05:00 |
|
Steve Harris
|
6fdbdfaf97
|
Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
Former-commit-id: be2931c623 [formerly 4e26e224fd] [formerly 65a3390a6a] [formerly be2931c623 [formerly 4e26e224fd] [formerly 65a3390a6a] [formerly 3bde6b3e41 [formerly 65a3390a6a [formerly ee696cb24c8d72f0562126a131824e958b88f090]]]]
Former-commit-id: 3bde6b3e41
Former-commit-id: 19f6fb968d [formerly 0edb16b05e] [formerly 674e8b1e2a9d464297f8e67d7a040e71d9e9e815 [formerly c3deafc840]]
Former-commit-id: e6ce649c9482699a06a1c902b2125fedd05ea2f0 [formerly 46b7122d56]
Former-commit-id: 9aa3a5a035
|
2014-06-02 07:31:14 -05:00 |
|
Brian.Dyke
|
a37a3d4ed5
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 4b0bf4f7af [formerly de2df4cb6f] [formerly b8ba378862] [formerly 4b0bf4f7af [formerly de2df4cb6f] [formerly b8ba378862] [formerly c6244e1950 [formerly b8ba378862 [formerly dec7b6fa091cab098b89a51551fa46b9f28b959b]]]]
Former-commit-id: c6244e1950
Former-commit-id: b7adb4f4f0 [formerly 30f72a9337] [formerly eef9582614e8cac7f605e8b40ab7d034718e2bc4 [formerly 6edbd149a5]]
Former-commit-id: de0cb68f2b7cefbbc444672a8668288909022b58 [formerly 45deec5df6]
Former-commit-id: 106a921a4c
|
2014-06-02 07:01:37 -04:00 |
|
Ron Anderson
|
6277338923
|
Omaha #2841 Fix errors when formatters fail to queue due to pending limit.
Change-Id: Icf70e25369a23b7b554718cf235feda02e615f0d
Former-commit-id: 217e4e7ba5 [formerly 916e607254] [formerly 1108744b40] [formerly 217e4e7ba5 [formerly 916e607254] [formerly 1108744b40] [formerly 22d67fcad1 [formerly 1108744b40 [formerly b15cb1632b58c415399ccc8dee6cf2c13140355f]]]]
Former-commit-id: 22d67fcad1
Former-commit-id: c3c6922ca9 [formerly 808254cd31] [formerly d4135f29979a9a7a46bf93cbfb0448b5916e82d3 [formerly 33abe4a8d3]]
Former-commit-id: fd2ba64516f8f24b1dccef988173407320b01d1d [formerly ecaa8ab0a9]
Former-commit-id: 14f0f927bf
|
2014-05-30 10:47:28 -05:00 |
|
Brian.Dyke
|
408ecfa5c0
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: 5524d6b38d [formerly a0a879be7d] [formerly a8737e18f0] [formerly 5524d6b38d [formerly a0a879be7d] [formerly a8737e18f0] [formerly 3f1e12effc [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]]
Former-commit-id: 3f1e12effc
Former-commit-id: c76d6df69d [formerly 3961c75ecd] [formerly 8ed2dc55683cd373c693766e728d2dbc5c2f9e63 [formerly 66aacd6578]]
Former-commit-id: 48941da01de7ecd361d967e7d76a018c85a27337 [formerly a23d371522]
Former-commit-id: 9351315fd6
|
2014-05-30 10:46:25 -04:00 |
|
brian.dyke
|
0511ff697f
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: f9cf99e369 [formerly 2c2bb61e95] [formerly 95c5dc49c1] [formerly f9cf99e369 [formerly 2c2bb61e95] [formerly 95c5dc49c1] [formerly 03cc2fbbfb [formerly 95c5dc49c1 [formerly 2e170e3e328804a56f65de7cec0f0e89d3f1aba4]]]]
Former-commit-id: 03cc2fbbfb
Former-commit-id: 0cbd37db4f [formerly b6623af1f7] [formerly 3bc9505e32a1d8fc6fd49b2e6e13c333e4573bb6 [formerly e09bd1d283]]
Former-commit-id: 2f8e75b3b74d8ab1aa705815c003473f38cbc788 [formerly 3f9ac5ba24]
Former-commit-id: 45dd00f016
|
2014-05-30 10:09:00 -04:00 |
|
Ron Anderson
|
82e73f875d
|
Merge "Omaha #2841 Separate queuing of text formatters and product scripts." into omaha_14.4.1
Former-commit-id: 3a27c2fe6e [formerly 27a9790684] [formerly 8309a5656a] [formerly 3a27c2fe6e [formerly 27a9790684] [formerly 8309a5656a] [formerly 7df866b471 [formerly 8309a5656a [formerly e13f80b81df762d6658cce9ad534dc499791ba46]]]]
Former-commit-id: 7df866b471
Former-commit-id: c64699d4eb [formerly f1a6e6735c] [formerly 00d9ffc82e7030f579603f67ec3703147a3de16a [formerly ff31990a13]]
Former-commit-id: b94ceb10ce25dbb3d80380a393f49fdced75782f [formerly 30495f52db]
Former-commit-id: 9d6658f1e9
|
2014-05-29 18:50:52 -05:00 |
|
Ron Anderson
|
4c8754f963
|
Omaha #2841 Separate queuing of text formatters and product scripts.
Change-Id: I4bfab25d4563914e7390b59d1717e8c82b016eb8
Former-commit-id: 2dec43f246 [formerly ce4047869c] [formerly a9f3b486f3] [formerly 2dec43f246 [formerly ce4047869c] [formerly a9f3b486f3] [formerly 8e1f4331da [formerly a9f3b486f3 [formerly 216be7d4dd6da9aefbdd6c55e9fd09f1a60bc53a]]]]
Former-commit-id: 8e1f4331da
Former-commit-id: 4669662fd9 [formerly 4d32cb561d] [formerly 654ed9178d63556b1133e4a0292cb347f920a036 [formerly f765c74e5e]]
Former-commit-id: e76c485f2f8d98e7e56b4624ca020b2e690ecf56 [formerly 114532dd8d]
Former-commit-id: 0c06544416
|
2014-05-29 16:55:02 -05:00 |
|
Richard Peter
|
bd6423f675
|
Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289
Former-commit-id: 8cbf5f4762 [formerly 3beef299b1] [formerly 558699a370] [formerly 8cbf5f4762 [formerly 3beef299b1] [formerly 558699a370] [formerly e2288769d3 [formerly 558699a370 [formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]]]]
Former-commit-id: e2288769d3
Former-commit-id: 23139f8b26 [formerly 121f0e00a4] [formerly 09f159abf4832d87decaa358207e37a58cf4a25a [formerly 220f7aa97a]]
Former-commit-id: 572b1480c60b64aa0cd08b4a426d8f2efe5a6538 [formerly 8ba13f812e]
Former-commit-id: aaab5e310f
|
2014-05-29 15:50:59 -05:00 |
|
Steve Harris
|
36e61bde42
|
Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository
Change-Id: Ib313d71006c3d23a76c1589fded47102fea80b9a
Former-commit-id: c4811405d5 [formerly f857812561] [formerly 79d5592fdf] [formerly c4811405d5 [formerly f857812561] [formerly 79d5592fdf] [formerly 5bc251beaa [formerly 79d5592fdf [formerly c944b3b98f68b8f65b853fb244002e3382dc38a2]]]]
Former-commit-id: 5bc251beaa
Former-commit-id: 615000d2ac [formerly 4af6e9f137] [formerly 18e12b1f641bb24f938a1a404f4f4a402bfdfc30 [formerly c830097b13]]
Former-commit-id: bd335dcc303b3ea0976df0c7b54fb55dfae737f2 [formerly 77e18c2e9a]
Former-commit-id: b09109b66e
|
2014-05-29 13:42:09 -05:00 |
|
Roger Ferrel
|
196e1fa22d
|
Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085
Former-commit-id: 176a2fb8cf [formerly eebc5096b2] [formerly 44a23b4500] [formerly 176a2fb8cf [formerly eebc5096b2] [formerly 44a23b4500] [formerly 825e2c1b19 [formerly 44a23b4500 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]]]]
Former-commit-id: 825e2c1b19
Former-commit-id: 8ab7513068 [formerly 73be1f66e9] [formerly edd5113dfda01da0c2e182625ddc3f1b5c02231b [formerly 15545c5239]]
Former-commit-id: 0d93eba78efa2bd1b9ec5aa5f43168c99f377894 [formerly 6c78b5e04c]
Former-commit-id: c882871747
|
2014-05-29 12:33:15 -05:00 |
|
Nate Jensen
|
0445850b36
|
Merge "Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager." into omaha_14.4.1
Former-commit-id: ecc95c47da [formerly 6fc643af39] [formerly 3e174fe39c] [formerly ecc95c47da [formerly 6fc643af39] [formerly 3e174fe39c] [formerly 8cc13d8334 [formerly 3e174fe39c [formerly db3ff4b3bf81cbea49169369be01ce5c919157fd]]]]
Former-commit-id: 8cc13d8334
Former-commit-id: dbc8186d11 [formerly c7da2eec51] [formerly 8eeba1773f2b4d96a73c8ec75449d2a752e5168c [formerly a921570418]]
Former-commit-id: 5eed1c0c07991bd98d3f44c5d03942a59f1fa1d0 [formerly fda484c9ff]
Former-commit-id: d1f08dcaf1
|
2014-05-28 12:43:12 -05:00 |
|
Ron Anderson
|
1b11561f3a
|
Merge "Omaha #3110 Permanent fix for mutable database creation." into omaha_14.4.1
Former-commit-id: 8f56396ad7 [formerly 8b580a891d] [formerly da0a173698] [formerly 8f56396ad7 [formerly 8b580a891d] [formerly da0a173698] [formerly 8b5daad4db [formerly da0a173698 [formerly 3869a36a6cad1674e8ec493d03937c21ddde7f21]]]]
Former-commit-id: 8b5daad4db
Former-commit-id: 8977f7f287 [formerly 0198ceb40a] [formerly 0f497e9315d5a30c2ac3076741001253d4391824 [formerly 191283e96d]]
Former-commit-id: 2bc767e870bc88ec0c846c854a4638e97bd9cf08 [formerly 81c044d476]
Former-commit-id: c237fd2699
|
2014-05-28 11:59:51 -05:00 |
|
Nate Jensen
|
247e4688fe
|
Merge "Omaha #3133 Removed dead hydro code and related dependencies" into omaha_14.4.1
Former-commit-id: e53ec8ab82 [formerly 719c53a044] [formerly 905fa8f283] [formerly e53ec8ab82 [formerly 719c53a044] [formerly 905fa8f283] [formerly e7dc89cddd [formerly 905fa8f283 [formerly 55cf25f0671f17e667f7c785f3580a93267f8790]]]]
Former-commit-id: e7dc89cddd
Former-commit-id: f0e019a24e [formerly 3f434ea6e9] [formerly 438dc2f8d1d87ff82e08c3c62233bc895b389264 [formerly 05b1401849]]
Former-commit-id: 62ebd5d7dedd4386ff43940345af53aa853509e0 [formerly e4df449f49]
Former-commit-id: d7cba4a465
|
2014-05-28 10:28:49 -05:00 |
|
Ron Anderson
|
fb8e1e58ce
|
Omaha #3110 Permanent fix for mutable database creation.
Former-commit-id: aabc6e4fa4 [formerly 17da90e8db] [formerly 4633de4ea3] [formerly aabc6e4fa4 [formerly 17da90e8db] [formerly 4633de4ea3] [formerly b7271025f9 [formerly 4633de4ea3 [formerly a0001c9ed3d414237069f43a29dd907111c16832]]]]
Former-commit-id: b7271025f9
Former-commit-id: 22a49335df [formerly 3e5acbf168] [formerly dff7778150c988782c4a53e9f37ff7197bd54d3d [formerly f2733999de]]
Former-commit-id: 5d7d6fc51a102e81f0fa290cf5c214633a85a5aa [formerly b6b463682f]
Former-commit-id: 1f4bde25d9
|
2014-05-28 10:09:12 -05:00 |
|
Steve Harris
|
86d6a0cd4d
|
Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java
Former-commit-id: 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly dc74953978 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]]
Former-commit-id: dc74953978
Former-commit-id: aa133cc8a3 [formerly 0e9d0b2ef5] [formerly b7d992179f759d29da9804b9ffcafec8048bcefa [formerly 713cfeffc7]]
Former-commit-id: 4b80090552f8712feaf5137c27c2f010cda148e2 [formerly 6412cc1427]
Former-commit-id: 5fda99b1fe
|
2014-05-28 09:01:00 -05:00 |
|
Steve Harris
|
6281b0148d
|
Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
Former-commit-id: 835486c63f [formerly a4825f4b27] [formerly 2c49d14c12] [formerly 835486c63f [formerly a4825f4b27] [formerly 2c49d14c12] [formerly 048d3748b7 [formerly 2c49d14c12 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]]]
Former-commit-id: 048d3748b7
Former-commit-id: 5469a5e863 [formerly 005e5b4ee2] [formerly 07a1965ea47f8ad30b0325329a0a7da148a19824 [formerly 4ed44b6e72]]
Former-commit-id: 84d3011f8d7a6ba7981aad3e8439f3e517ebf403 [formerly 95462b4f80]
Former-commit-id: 1f24080b8e
|
2014-05-28 07:41:42 -05:00 |
|