Brian.Dyke
|
265a520479
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: e6457a002e [formerly d8271549ff] [formerly fe85eb9f70] [formerly fe85eb9f70 [formerly 3d9a3de6e4]] [formerly e6457a002e [formerly d8271549ff] [formerly fe85eb9f70] [formerly fe85eb9f70 [formerly 3d9a3de6e4]] [formerly 01dfe503f5 [formerly fe85eb9f70 [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 134e431ecf [formerly 3319853886] [formerly 29364e2b9f] [formerly 1ef1f60ee420f3daa5f1822257935edb2da48edd [formerly 3c59646613e08582e0a259ecdec538060ca047c5] [formerly 29364e2b9f [formerly c42733eb39]]]
Former-commit-id: 8d465ff22d575dda7abe4a340184baef74cc44db [formerly 582e8cd843a57e8f4ac7a6572a5b3e23cd3b4f25] [formerly 0f9fe8301a [formerly a31d3d702e]]
Former-commit-id: 0f9fe8301a
Former-commit-id: 74f3dd287f
|
2014-09-09 11:44:30 -04:00 |
|
Brian.Dyke
|
5f21fc890c
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: ca5b785430 [formerly a344be95c8] [formerly 5415a4939a] [formerly 5415a4939a [formerly 858b91d677]] [formerly ca5b785430 [formerly a344be95c8] [formerly 5415a4939a] [formerly 5415a4939a [formerly 858b91d677]] [formerly af477df90e [formerly 5415a4939a [formerly 858b91d677] [formerly af477df90e [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]]]]
Former-commit-id: af477df90e
Former-commit-id: cee7b18bb7 [formerly 4582533601] [formerly dde3efc567] [formerly 905104ae885e3b6871106bcd685d27d95e9545bf [formerly f892d9608dc1fb65163dac3714b16398a7d89022] [formerly dde3efc567 [formerly 6c4b121752]]]
Former-commit-id: b9d5c3f60edb9de6fdee9b40c209e4881341caeb [formerly 2c8a415a8d01954bd8f0e11fa551974a70c7759e] [formerly b42aba7839 [formerly 66c4758f2d]]
Former-commit-id: b42aba7839
Former-commit-id: 0c715b7439
|
2014-09-08 14:54:16 -04:00 |
|
Brian.Dyke
|
af18a2312a
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 887a7c3c02 [formerly 4b84db346d] [formerly 4220590613] [formerly 4220590613 [formerly 9e1ee22146]] [formerly 887a7c3c02 [formerly 4b84db346d] [formerly 4220590613] [formerly 4220590613 [formerly 9e1ee22146]] [formerly 702dd65aa7 [formerly 4220590613 [formerly 9e1ee22146] [formerly 702dd65aa7 [formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]]]]]
Former-commit-id: 702dd65aa7
Former-commit-id: 52950f98d4 [formerly 04ec788c46] [formerly 901ed0dca8] [formerly f86dc353b11a231ec1e3ab986d0ed38358834161 [formerly 8d7d10230b30c894cb57741468e90fccc83202bb] [formerly 901ed0dca8 [formerly ebf9ad1299]]]
Former-commit-id: bd608eea99ac79e68ddd69cb085e75c6c23589ed [formerly 234e9640a89e67374198a73344fce2d5694831c8] [formerly 9f0254ee22 [formerly c868172449]]
Former-commit-id: 9f0254ee22
Former-commit-id: a6019667cc
|
2014-09-05 11:13:12 -04:00 |
|
Brian.Dyke
|
b1b2c6de50
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: f2c55dab40 [formerly aac4db559a] [formerly cdd1e08ee3] [formerly cdd1e08ee3 [formerly d7407481ef]] [formerly f2c55dab40 [formerly aac4db559a] [formerly cdd1e08ee3] [formerly cdd1e08ee3 [formerly d7407481ef]] [formerly 9f7fabb002 [formerly cdd1e08ee3 [formerly d7407481ef] [formerly 9f7fabb002 [formerly c1f870d9df7579741e5a1d79cdec77293115e968]]]]]
Former-commit-id: 9f7fabb002
Former-commit-id: db0b335f86 [formerly 47d1e3fc72] [formerly 8a3f7aa5d9] [formerly f29f61d2f18c8509060c3291b920e6b0a0c4de99 [formerly 837e597fdc8b199428dda951988ca6f8034cc15e] [formerly 8a3f7aa5d9 [formerly 6f4bdae843]]]
Former-commit-id: 1557ff2edf6f99eed53d3fcfb07273f86866618c [formerly 4d9d4a799a8132e78ff387f5d9ac30b936a01948] [formerly ea20efaf55 [formerly 86e748a02e]]
Former-commit-id: 05133e315d6773cb94e9d3fe1257bc5dbbfcc795 [formerly ea20efaf55]
Former-commit-id: e4bf146b21
|
2014-09-05 10:57:14 -04:00 |
|
Ana Rivera
|
a50f66c147
|
VLab Issue #4601 - Update to SMS DR #16720; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152
Former-commit-id: c7dd211b66 [formerly 5a534e377c] [formerly c77e5412a6] [formerly c77e5412a6 [formerly 6d48576930]] [formerly c7dd211b66 [formerly 5a534e377c] [formerly c77e5412a6] [formerly c77e5412a6 [formerly 6d48576930]] [formerly a8b04b8e63 [formerly c77e5412a6 [formerly 6d48576930] [formerly a8b04b8e63 [formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]]]]]
Former-commit-id: a8b04b8e63
Former-commit-id: 937ec81d8f [formerly 3018955360] [formerly f5695a423d] [formerly 881443ce2879db9b75ed3727e4f4c568217765d5 [formerly 5fa5b948bc157a0af41e64acb9d93c5ee63df7fd] [formerly f5695a423d [formerly ac4f61813f]]]
Former-commit-id: fefdb4f46f1445268c37b96b502663d10bceb345 [formerly 941d2e1472a9faf92a73224d0a040bed3871fa83] [formerly 9d16e16770 [formerly 3e1039b714]]
Former-commit-id: 9d16e16770
Former-commit-id: a0969efb51
|
2014-09-05 13:27:29 +00:00 |
|
Brian.Dyke
|
dc6b9bdda3
|
Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
Former-commit-id: d4a52ae0df [formerly 2d86fd1bf1] [formerly 15381f5e9f] [formerly 15381f5e9f [formerly 7b7ef56b04]] [formerly d4a52ae0df [formerly 2d86fd1bf1] [formerly 15381f5e9f] [formerly 15381f5e9f [formerly 7b7ef56b04]] [formerly a610fe6475 [formerly 15381f5e9f [formerly 7b7ef56b04] [formerly a610fe6475 [formerly a77577595da1e2dcc8057c5a8b8643a612780339]]]]]
Former-commit-id: a610fe6475
Former-commit-id: 11efc34cbb [formerly 919ff95953] [formerly f3b51b9187] [formerly 5d8727a415de65742d8c5dc9df87b57cc2771135 [formerly adaa82711061aa3d35c4dd1cf23534e670b43789] [formerly f3b51b9187 [formerly e64fe3875e]]]
Former-commit-id: 846c47562caf8111df3f604a4d42a92054b1d222 [formerly eb82e30397f39ad87c2a239ed4c2bb3ffdd289d3] [formerly 116aa56b02 [formerly a8f49dd627]]
Former-commit-id: 116aa56b02
Former-commit-id: fd4fa84413
|
2014-09-04 15:59:00 -04:00 |
|
Brian.Dyke
|
fe9b70a520
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: 5d0b2d9d90 [formerly 8216b05646] [formerly c586c26447] [formerly c586c26447 [formerly e762271240]] [formerly 5d0b2d9d90 [formerly 8216b05646] [formerly c586c26447] [formerly c586c26447 [formerly e762271240]] [formerly e5227e90de [formerly c586c26447 [formerly e762271240] [formerly e5227e90de [formerly ad120a9357402fbdedb350cabe88d2becf5d7361]]]]]
Former-commit-id: e5227e90de
Former-commit-id: 1f18534a55 [formerly 77c6ff9f3f] [formerly 1ee7743b8b] [formerly c7692d18c9810b780c1b4216a8909c86ab9f6d14 [formerly f8be9d1c72764746e3b7750b460ddfb0ab41df5f] [formerly 1ee7743b8b [formerly c48196cd33]]]
Former-commit-id: 45edf5732c0c6d289a35e3c9869be8834b04c199 [formerly 55f6dc81695914b89fcdeec5f133f62b18caa226] [formerly d6ef2b6737 [formerly 108d0bfc77]]
Former-commit-id: 9fdf763605fdf0a601bf52ce9004b7cc7e5ce3d2 [formerly d6ef2b6737]
Former-commit-id: 54b4e33b53
|
2014-09-04 14:18:34 -04:00 |
|
Qinglu.Lin
|
2503c6f38e
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110
Former-commit-id: a3fe1957e4 [formerly efd54751a5] [formerly 62bcefb9e1] [formerly 62bcefb9e1 [formerly 8c28597210]] [formerly a3fe1957e4 [formerly efd54751a5] [formerly 62bcefb9e1] [formerly 62bcefb9e1 [formerly 8c28597210]] [formerly 902b6c55bd [formerly 62bcefb9e1 [formerly 8c28597210] [formerly 902b6c55bd [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]]]]]
Former-commit-id: 902b6c55bd
Former-commit-id: 40baa95a76 [formerly 750951ed31] [formerly 920b6bb53b] [formerly 00c2bd716e2273bae7ab490016f387569a30bf11 [formerly 4fb24f077ee8254399c85a7e1b5bdb926ee3bf91] [formerly 920b6bb53b [formerly 9c67b89df7]]]
Former-commit-id: a73645f16a7853d84ba710f75356fbd46add2621 [formerly 24838cc154dff53eef269cc01790469a9c0466f9] [formerly ec9b3fa971 [formerly c746dbabad]]
Former-commit-id: fe46f67595f640abbfb48d0637114a5a49bb29c1 [formerly ec9b3fa971]
Former-commit-id: e4c8ecb46f
|
2014-09-04 14:09:24 -04:00 |
|
Brian.Dyke
|
d61a91fe0d
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: d24f3e3583 [formerly a05fabaeef] [formerly 2b613a26fd] [formerly 2b613a26fd [formerly 72e2882496]] [formerly d24f3e3583 [formerly a05fabaeef] [formerly 2b613a26fd] [formerly 2b613a26fd [formerly 72e2882496]] [formerly 9e94c2c571 [formerly 2b613a26fd [formerly 72e2882496] [formerly 9e94c2c571 [formerly 2c4c1a5babcfdcfadeb042a190bc79c7973e1a36]]]]]
Former-commit-id: 9e94c2c571
Former-commit-id: f1fd190440 [formerly 864e983578] [formerly 6d69d0678c] [formerly 4d607b49f0dfc2e63c5574d610d6d272b02fd678 [formerly cd576ae808d85bcd42ccda7363874977497de518] [formerly 6d69d0678c [formerly 5a1fa755f9]]]
Former-commit-id: 34a2e6de3f00abb949cf34e23ed60ba723079125 [formerly 4ca4236b54e384a356a3937d49fc07eb78b6807d] [formerly 06a516d948 [formerly 1c871eaf3d]]
Former-commit-id: 06a516d948
Former-commit-id: e242265add
|
2014-09-04 14:01:26 -04:00 |
|
Nate Jensen
|
04e39076fd
|
Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320
Former-commit-id: 51bd5a471a [formerly 8cad8cb257] [formerly a1bccdc57f] [formerly a1bccdc57f [formerly 2cfbfc1dc4]] [formerly 51bd5a471a [formerly 8cad8cb257] [formerly a1bccdc57f] [formerly a1bccdc57f [formerly 2cfbfc1dc4]] [formerly 87d507313b [formerly a1bccdc57f [formerly 2cfbfc1dc4] [formerly 87d507313b [formerly 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782]]]]]
Former-commit-id: 87d507313b
Former-commit-id: a0bef91328 [formerly 62c34f3978] [formerly 6d47c3c987] [formerly 8f202087889f39ca94a32e2e79ef40702c99eed9 [formerly 1827159999737e3992f042bc4bf2d5f168d0040c] [formerly 6d47c3c987 [formerly b1619c055a]]]
Former-commit-id: 8994e89086c17f685069893bd93da34e3f82f571 [formerly 89ccc177eba1c91fcf03533fc346258ea333dac7] [formerly 680fa77b9d [formerly 0e6c455b42]]
Former-commit-id: 680fa77b9d
Former-commit-id: 2587255db1
|
2014-09-04 10:10:37 -05:00 |
|
Brian.Dyke
|
41bff3fe4e
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: 4f7e303668 [formerly 9c9de8b351] [formerly fa6b302ab6] [formerly fa6b302ab6 [formerly 043a95d35e]] [formerly 4f7e303668 [formerly 9c9de8b351] [formerly fa6b302ab6] [formerly fa6b302ab6 [formerly 043a95d35e]] [formerly d695dd0084 [formerly fa6b302ab6 [formerly 043a95d35e] [formerly d695dd0084 [formerly 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a]]]]]
Former-commit-id: d695dd0084
Former-commit-id: 6c786f30e1 [formerly eaec75b4a4] [formerly 947d137798] [formerly f366194c3c311e2db539894fcd6ddabfcd97c696 [formerly 373646f8580532c5fec0e2325501ff29895686fe] [formerly 947d137798 [formerly 62a70ef5ca]]]
Former-commit-id: 344e7b71d09e866d6cc09bf57e2962b842839dc4 [formerly 46d787dc847da3a7fa06fa26384d6e234a887164] [formerly fcb029505a [formerly fff0709c92]]
Former-commit-id: fcb029505a
Former-commit-id: 2d71841c17
|
2014-09-03 21:14:27 -04:00 |
|
Brian.Dyke
|
3105c0d190
|
ASM #15697 - Fix Hydro Perspective Issue
Former-commit-id: 41f0ad3411 [formerly 08ec7d5802] [formerly 3ddb5831a0] [formerly 3ddb5831a0 [formerly 121a2d100f]] [formerly 41f0ad3411 [formerly 08ec7d5802] [formerly 3ddb5831a0] [formerly 3ddb5831a0 [formerly 121a2d100f]] [formerly cfe03adff6 [formerly 3ddb5831a0 [formerly 121a2d100f] [formerly cfe03adff6 [formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]]]]]
Former-commit-id: cfe03adff6
Former-commit-id: 3f023b0927 [formerly db0a674c09] [formerly 50858cac9f] [formerly 369017f75d20caadec5f1426e51a4bc4e8a076c8 [formerly 1b07514d703a75f568de16f4735df22d87a507b5] [formerly 50858cac9f [formerly e8a85da57a]]]
Former-commit-id: fed6bd2fb90aa1f45b65d11e491ba0ed7f4d9749 [formerly 15b4fb7b9368eb841d55989ce92c21b66ff788a9] [formerly 7bc9c15a9e [formerly 7f1e3b0ead]]
Former-commit-id: 7bc9c15a9e
Former-commit-id: 46dbcd6c52
|
2014-09-03 21:10:16 -04:00 |
|
Steve Harris
|
c6a56c028d
|
Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
Former-commit-id: 931ba573fb [formerly 197e5ad6ff] [formerly 0ea6b72088] [formerly 0ea6b72088 [formerly 0e869fa6c1]] [formerly 931ba573fb [formerly 197e5ad6ff] [formerly 0ea6b72088] [formerly 0ea6b72088 [formerly 0e869fa6c1]] [formerly afa45bf919 [formerly 0ea6b72088 [formerly 0e869fa6c1] [formerly afa45bf919 [formerly 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4]]]]]
Former-commit-id: afa45bf919
Former-commit-id: c8b0233ba3 [formerly ea7d9a009a] [formerly 550eb6e3ac] [formerly 8f2eecf009996bef64b709685e0fbf529659fbc2 [formerly 76a150860a6752d36b9f2a8e4ce9b2e048e62694] [formerly 550eb6e3ac [formerly e3d99832ec]]]
Former-commit-id: 4ca89f7e73bdda510f59fca123e668217ccb1c0c [formerly 4a24c3d6d81ccc702abc4792ab9a533e6f9f0355] [formerly 67969a5118 [formerly 49a48c4874]]
Former-commit-id: 67969a5118
Former-commit-id: e938f3b297
|
2014-09-03 15:22:00 -05:00 |
|
Richard Peter
|
177ec8969c
|
Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
Former-commit-id: 24b193f1f4 [formerly 63e9bd37c1] [formerly 1c05f1b459] [formerly 1c05f1b459 [formerly 3de26efce6]] [formerly 24b193f1f4 [formerly 63e9bd37c1] [formerly 1c05f1b459] [formerly 1c05f1b459 [formerly 3de26efce6]] [formerly af87813ea9 [formerly 1c05f1b459 [formerly 3de26efce6] [formerly af87813ea9 [formerly 5f9298d52d0a11775588ed3742f2c2d3f19da1d0]]]]]
Former-commit-id: af87813ea9
Former-commit-id: 9749169c00 [formerly 2c45051b4d] [formerly 1277318360] [formerly 742ad20a4eb5b535ce06290c410f562a96cee7a1 [formerly 08f3ee33704050f8d74f62d99046351a72dfb891] [formerly 1277318360 [formerly ad59d54110]]]
Former-commit-id: 6248dcc97b93ade73b4d72b31415c3ea9fc8746d [formerly 6bee98c9c4e44407ae14c22e6a5380ecc297f301] [formerly 9991229ab4 [formerly 70e9fd7859]]
Former-commit-id: 446448627e28608f81706c976e8581fd13ace8a8 [formerly 9991229ab4]
Former-commit-id: 72e7ce3000
|
2014-09-03 09:42:34 -05:00 |
|
Nate Jensen
|
4448d25d12
|
Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
Former-commit-id: c20691430e [formerly 585516210d] [formerly a690b853bb] [formerly a690b853bb [formerly 0f35426ad0]] [formerly c20691430e [formerly 585516210d] [formerly a690b853bb] [formerly a690b853bb [formerly 0f35426ad0]] [formerly c23071f48c [formerly a690b853bb [formerly 0f35426ad0] [formerly c23071f48c [formerly 9e0f31fc6601a39938deeaf7e1c8ed8849e43288]]]]]
Former-commit-id: c23071f48c
Former-commit-id: fef5661641 [formerly 6b60f3cab1] [formerly e5f28ab1f9] [formerly 985404860b7981b767f6c81e72c763be7f60d406 [formerly 224426c54bdc59844b7fe1584ba3efbfd084b116] [formerly e5f28ab1f9 [formerly d9d0068a1c]]]
Former-commit-id: 6a56d53d68c401b815e93a2ebe840ed34ca8148c [formerly a7930718e1b56b1f10f592043a9840a8ad65d172] [formerly ea4fd384ca [formerly fd931efdf2]]
Former-commit-id: ea4fd384ca
Former-commit-id: c4f408ecd1
|
2014-09-02 17:34:59 -05:00 |
|
Brian.Dyke
|
7f35d148f9
|
Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
Former-commit-id: 306438d296 [formerly bdba05f6b1] [formerly 9e156775e5] [formerly 9e156775e5 [formerly fd8ad016ef]] [formerly 306438d296 [formerly bdba05f6b1] [formerly 9e156775e5] [formerly 9e156775e5 [formerly fd8ad016ef]] [formerly 14e64881a1 [formerly 9e156775e5 [formerly fd8ad016ef] [formerly 14e64881a1 [formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]]]]]
Former-commit-id: 14e64881a1
Former-commit-id: 626d4685d6 [formerly 00175029c5] [formerly 75fccb7361] [formerly bfba65a08132d981fd9a40a5f614bd9baa284210 [formerly 1eb2f1f9e0f92550688af61f814e53ebcd21e85a] [formerly 75fccb7361 [formerly 43c9dfa397]]]
Former-commit-id: 901497f905911c923a7d301f379d2ace63d6b86f [formerly 481daae46a50a3916d1fdb63ccaf21ee51a408cd] [formerly e8143081cb [formerly 2d9a8a8b40]]
Former-commit-id: e8143081cb
Former-commit-id: 67d4a5f91b
|
2014-09-02 16:32:54 -04:00 |
|
Brian.Dyke
|
b6df06bc1a
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 71611f2cea [formerly 9105ef9aa2] [formerly e425e5bf8c] [formerly e425e5bf8c [formerly f0875e724f]] [formerly 71611f2cea [formerly 9105ef9aa2] [formerly e425e5bf8c] [formerly e425e5bf8c [formerly f0875e724f]] [formerly 611e036e75 [formerly e425e5bf8c [formerly f0875e724f] [formerly 611e036e75 [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]]]]
Former-commit-id: 611e036e75
Former-commit-id: b447f97892 [formerly 0015f2440e] [formerly 3b9653ef00] [formerly 55df927e29dc0b262862514affe872efa0707c93 [formerly c73653650f9ff8397fc5371a4686056fcc738000] [formerly 3b9653ef00 [formerly caf5f778e9]]]
Former-commit-id: ce23840bc42db3d3375e9d1c4972fb50d68c607e [formerly 8382ee6ae605cca7bbd88f333d4d1875fc119a63] [formerly 0d6ef0345d [formerly 4425e3db61]]
Former-commit-id: 0d6ef0345d
Former-commit-id: 3539b14e3b
|
2014-09-02 16:30:51 -04:00 |
|
Benjamin Phillippe
|
c460649551
|
Issue #3560 Registry objects not re-sent after fully sync
Change-Id: Id38989cf953aacb985d627422c043f8768df2ed0
Former-commit-id: dd1d87d220 [formerly 0c5dad994f] [formerly 30f3289917] [formerly 30f3289917 [formerly 7265bf54c7]] [formerly dd1d87d220 [formerly 0c5dad994f] [formerly 30f3289917] [formerly 30f3289917 [formerly 7265bf54c7]] [formerly 955ac3a670 [formerly 30f3289917 [formerly 7265bf54c7] [formerly 955ac3a670 [formerly 15e57fc58bee1045c5574e4d66a727a672ac83cb]]]]]
Former-commit-id: 955ac3a670
Former-commit-id: 1f612bfb88 [formerly 12b6ede128] [formerly df919cf8e3] [formerly d74f0e5710323f004f8c69eac27d0e88f3fb58d2 [formerly 1b95f465a554716aafbebe611aaa9449d3b2ae13] [formerly df919cf8e3 [formerly d6c265e78e]]]
Former-commit-id: 1f11a390c623ea774236114d89ab8d637acdad8a [formerly 170f255dd1306f1b971bc3433318ad78941e71a0] [formerly 2e91209f47 [formerly 6d47294138]]
Former-commit-id: 2e91209f47
Former-commit-id: 349af228f9
|
2014-09-02 14:46:50 -05:00 |
|
Brian.Dyke
|
f226e7f78f
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: 265393edcf [formerly a76150b1a7] [formerly 65f8fc89f0] [formerly 65f8fc89f0 [formerly 368f80f220]] [formerly 265393edcf [formerly a76150b1a7] [formerly 65f8fc89f0] [formerly 65f8fc89f0 [formerly 368f80f220]] [formerly b1dbaa0b50 [formerly 65f8fc89f0 [formerly 368f80f220] [formerly b1dbaa0b50 [formerly f9daf7d6e906904e96438fabc510e24ff66536d4]]]]]
Former-commit-id: b1dbaa0b50
Former-commit-id: 4a10684072 [formerly 8f03fd0274] [formerly 045647bb37] [formerly 109e708c6801443fdc1de00d4593bcb3cee94d3c [formerly 43f0dc59c33b7743e63ed6a533b0ca2012370c82] [formerly 045647bb37 [formerly a1889cd15e]]]
Former-commit-id: 0e5d6b730b6f0d67150eb3ada277c11720713c9f [formerly c433f75ba5ca6d60a2ce55518254ef98b080caa8] [formerly cd6bf05d34 [formerly efb7dcb397]]
Former-commit-id: a765fa49e70333c53eae07907a56fa7305cf157a [formerly cd6bf05d34]
Former-commit-id: c794f123cf
|
2014-09-02 15:09:06 -04:00 |
|
Qinglu.Lin
|
20f101addd
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: d7c4258d6d [formerly dda32f85e9] [formerly b32ea40289] [formerly b32ea40289 [formerly 2374673f8d]] [formerly d7c4258d6d [formerly dda32f85e9] [formerly b32ea40289] [formerly b32ea40289 [formerly 2374673f8d]] [formerly ae13ea419e [formerly b32ea40289 [formerly 2374673f8d] [formerly ae13ea419e [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]]]]
Former-commit-id: ae13ea419e
Former-commit-id: 6c47efdba4 [formerly 5c521a214c] [formerly 3fcdc279ea] [formerly 875b107a15507c481b563c68fdf9a39858c48e3c [formerly 153a4d5b66ab5d399ab180ca9af559bd33c0b1bf] [formerly 3fcdc279ea [formerly 075df9d234]]]
Former-commit-id: addf3888bdeedcf92cd14e0a89ad974356164e32 [formerly 04e6c13acdb23e049d0e8a380998b12c7056105a] [formerly 7ec0ec8877 [formerly 415af39911]]
Former-commit-id: 7ec0ec8877
Former-commit-id: 175af9a9d3
|
2014-09-02 14:37:19 -04:00 |
|
Ron Anderson
|
1831bfcc16
|
Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce
Former-commit-id: bd96a807ed [formerly c5a32980d6] [formerly c7fbca0298] [formerly c7fbca0298 [formerly 46c62a1db6]] [formerly bd96a807ed [formerly c5a32980d6] [formerly c7fbca0298] [formerly c7fbca0298 [formerly 46c62a1db6]] [formerly 434d412882 [formerly c7fbca0298 [formerly 46c62a1db6] [formerly 434d412882 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]]]]]
Former-commit-id: 434d412882
Former-commit-id: dea9fd7247 [formerly 215d5f262e] [formerly 19ce2bb34e] [formerly 224cce7aebf99b89c95d0c61f7088f75b7d6a2d6 [formerly d4fadbd148424d34474cdcf3ba53cd32ad36b1f0] [formerly 19ce2bb34e [formerly 24fba5cc20]]]
Former-commit-id: 0f781eeee633aae4eb5625535c65fe2d612f95d8 [formerly 00a79119c6c0303cfa622498ee2804eb04c1903f] [formerly 699fe1637e [formerly cad80d1060]]
Former-commit-id: 699fe1637e
Former-commit-id: dd329dbd57
|
2014-09-02 12:21:42 -05:00 |
|
Richard Peter
|
b188bf5a8d
|
Merge "Issue #3560 Fix for registry memory issue" into omaha_14.2.4
Former-commit-id: 094ec2ca18 [formerly 9489243db9] [formerly abc807850f] [formerly abc807850f [formerly be2474da34]] [formerly 094ec2ca18 [formerly 9489243db9] [formerly abc807850f] [formerly abc807850f [formerly be2474da34]] [formerly 0e29b2d17f [formerly abc807850f [formerly be2474da34] [formerly 0e29b2d17f [formerly 6789576e88de568c6014c29d099349cec40c7c74]]]]]
Former-commit-id: 0e29b2d17f
Former-commit-id: c126da1daa [formerly 0226ed3c06] [formerly 050e1f67d3] [formerly 5f49380373387eaff7a12a737cf61e0808b9b669 [formerly d0d9235810b10eed90b7d86cae612e9695672528] [formerly 050e1f67d3 [formerly e992fee66a]]]
Former-commit-id: c216b41b5b54bcb4024d40ae0e222742ca223d39 [formerly d2acb3e7d0c61d6e8a011e66d89f407ddca90721] [formerly 063bfe0a8a [formerly 3408442222]]
Former-commit-id: 4cb8eb99ae0fe8ad17c2fbcf64ba0fbb3d5e78fa [formerly 063bfe0a8a]
Former-commit-id: 288a906bbd
|
2014-09-02 12:15:38 -05:00 |
|
Benjamin Phillippe
|
c6b5d7a407
|
Issue #3560 Fix for registry memory issue
Former-commit-id: 4e06aab58a [formerly c00e99fa33] [formerly 12914fb1e5] [formerly 12914fb1e5 [formerly ab8b2ef473]] [formerly 4e06aab58a [formerly c00e99fa33] [formerly 12914fb1e5] [formerly 12914fb1e5 [formerly ab8b2ef473]] [formerly 2da57d3bc2 [formerly 12914fb1e5 [formerly ab8b2ef473] [formerly 2da57d3bc2 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]]]]]
Former-commit-id: 2da57d3bc2
Former-commit-id: b6271f32a2 [formerly f8eac1c5dd] [formerly c180ce2758] [formerly 4e2d1148388b4f8f0b2db8db9f6fb564b3816cae [formerly 297c1c315b814d7db8fde2a56eeb56d15518cf06] [formerly c180ce2758 [formerly 393c67dbe9]]]
Former-commit-id: 8fcdee275ca93e6bc6221922e3cb8a9151d4f131 [formerly 35b5f0063d9854e2e07156583373ec6fa6d63dbf] [formerly 94ffd5d5f0 [formerly 565c858c3e]]
Former-commit-id: 94ffd5d5f0
Former-commit-id: bca70fb7fa
|
2014-09-02 10:00:35 -05:00 |
|
Dave Hladky
|
a2f781f7b1
|
Issue #3564 Allow for un-authenicated WFS HTTPS connections.
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a
Former-commit-id: 6088257fe5 [formerly 4b22309742] [formerly 534b784843] [formerly 534b784843 [formerly 9c3b002990]] [formerly 6088257fe5 [formerly 4b22309742] [formerly 534b784843] [formerly 534b784843 [formerly 9c3b002990]] [formerly 82fd7189b9 [formerly 534b784843 [formerly 9c3b002990] [formerly 82fd7189b9 [formerly 7afe5332fcf41bbc8bb2411944584405f3ba686a]]]]]
Former-commit-id: 82fd7189b9
Former-commit-id: 71e08b9463 [formerly 77b4003cf8] [formerly 80d0e2594f] [formerly 12fef9464b8593cf1944605d27b880539b0bbe83 [formerly cb2ec0507bd999daab7cd2f39d5b6532cfef68ed] [formerly 80d0e2594f [formerly 9ac2a3adee]]]
Former-commit-id: d2cca28c5f694704631fc30489016b95e16347cb [formerly f282cbe079f9369b49673515fe4fe83dd5283e90] [formerly f165391a1b [formerly c1bf96b142]]
Former-commit-id: f165391a1b
Former-commit-id: 24119a4273
|
2014-09-02 09:38:21 -05:00 |
|
Steve Harris
|
4e50d049dc
|
Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: af703a1259 [formerly 9e79ff1cff] [formerly f7e39c9d6f] [formerly f7e39c9d6f [formerly 3b6a003884]] [formerly af703a1259 [formerly 9e79ff1cff] [formerly f7e39c9d6f] [formerly f7e39c9d6f [formerly 3b6a003884]] [formerly e7705c328e [formerly f7e39c9d6f [formerly 3b6a003884] [formerly e7705c328e [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]]]]]
Former-commit-id: e7705c328e
Former-commit-id: 50324c3cbf [formerly 6184a8ef57] [formerly 79c7e0b492] [formerly 54a00b3063dd5d6881f9ac220cda3430b2baa3cb [formerly 5cde04894fc320a0e396dcbcda7917b88bf7faf3] [formerly 79c7e0b492 [formerly 92a45c76fb]]]
Former-commit-id: 7a346d0f22f78ac2744045ade24cba5016815b8a [formerly d186fe408ae810a2d706db3817a1118abbd73681] [formerly f1c77c42ed [formerly 6279cdb55c]]
Former-commit-id: f1c77c42ed
Former-commit-id: a8dce1da7e
|
2014-09-02 08:12:49 -05:00 |
|
Steve Harris
|
570b566638
|
Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2
Former-commit-id: 06896c9032 [formerly db74ef9c6d] [formerly 142f1bff66] [formerly 142f1bff66 [formerly db74dc031e]] [formerly 06896c9032 [formerly db74ef9c6d] [formerly 142f1bff66] [formerly 142f1bff66 [formerly db74dc031e]] [formerly 425e8243f2 [formerly 142f1bff66 [formerly db74dc031e] [formerly 425e8243f2 [formerly 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21]]]]]
Former-commit-id: 425e8243f2
Former-commit-id: c1312a2e23 [formerly 527bb46f95] [formerly 5f0e7e3581] [formerly 7e79e730d36d4a4ed38a4b210e21602a7ddb5307 [formerly e4867f4026004901057b68452841e0b1dfb767d8] [formerly 5f0e7e3581 [formerly 6563187041]]]
Former-commit-id: aadd473b129155ba5604dac8f02313694fd27269 [formerly fbc4e34e259a9c29bb47e8d0de695403c93929f2] [formerly 3806bd14eb [formerly f72eb20900]]
Former-commit-id: 3806bd14eb
Former-commit-id: 248ece0f93
|
2014-09-02 08:09:48 -05:00 |
|
Kiran.Shrestha
|
a5767268b4
|
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6
Former-commit-id: 10310e8165 [formerly b4a897c5a7] [formerly 3abf28f856] [formerly 3abf28f856 [formerly a285439c08]] [formerly 10310e8165 [formerly b4a897c5a7] [formerly 3abf28f856] [formerly 3abf28f856 [formerly a285439c08]] [formerly d8bd6a9c70 [formerly 3abf28f856 [formerly a285439c08] [formerly d8bd6a9c70 [formerly 1681bea10870df58b3f2cc0d0a59f21c596e9e95]]]]]
Former-commit-id: d8bd6a9c70
Former-commit-id: 8519bf57e6 [formerly 8ad4aa78a8] [formerly f278d7edbf] [formerly 9fb37be9bf3bffc27b5d8abaa82c796515852bbc [formerly c3bd761b7a4aa4335ef9629b9656cb7ddd1bdbd2] [formerly f278d7edbf [formerly 2687526cec]]]
Former-commit-id: acb5d57651e9bb69d7c5e1fb56d9ef0dca011992 [formerly 31f923783e15681c3e9248f3dec8597494a3ecce] [formerly df635b2a58 [formerly 022a4dc4dc]]
Former-commit-id: 2215f37bdb8bbb04527d48509f5c437d0cebaa54 [formerly df635b2a58]
Former-commit-id: 7b8e3b5390
|
2014-08-29 13:50:55 -04:00 |
|
Brian.Dyke
|
50845f5b0f
|
Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: 8822598311 [formerly 31c13bf0bf] [formerly a5519a28d9] [formerly a5519a28d9 [formerly 37c926973c]] [formerly 8822598311 [formerly 31c13bf0bf] [formerly a5519a28d9] [formerly a5519a28d9 [formerly 37c926973c]] [formerly a2f66c8d97 [formerly a5519a28d9 [formerly 37c926973c] [formerly a2f66c8d97 [formerly cff9bfd2697a73ccc18642d8dc057b6a27aa2991]]]]]
Former-commit-id: a2f66c8d97
Former-commit-id: 2ed37d5200 [formerly d805faa88c] [formerly d14d2b9a30] [formerly c30d55cf263e18f0fca49e7319e8bdad2b86cba9 [formerly 39e8d8ffde8b1fa357b628c70cca02439f025ba2] [formerly d14d2b9a30 [formerly f3eba57747]]]
Former-commit-id: 03d9feca7c77998d1c6ac2dfbdf4004190333de9 [formerly d89b641dbae4734fb3a72f403f69b6fe21f7e7ae] [formerly 85d763def5 [formerly 24a0b8457e]]
Former-commit-id: 85d763def5
Former-commit-id: a784936b10
|
2014-08-29 10:07:14 -04:00 |
|
Brian Clements
|
78aa849820
|
Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040
Former-commit-id: 16422cd607 [formerly c0b132d6ee] [formerly 981390eb22] [formerly 981390eb22 [formerly b352bd3944]] [formerly 16422cd607 [formerly c0b132d6ee] [formerly 981390eb22] [formerly 981390eb22 [formerly b352bd3944]] [formerly cfeb16eff8 [formerly 981390eb22 [formerly b352bd3944] [formerly cfeb16eff8 [formerly b3482522860408c2d052261e845899cf73c2ce96]]]]]
Former-commit-id: cfeb16eff8
Former-commit-id: 24ad951025 [formerly 3015aef7b9] [formerly c337087043] [formerly c567b1891a59681a9dfdb4738db35d029ca0b1fa [formerly da0614500f744bdca9a9cd20f1050898018e3164] [formerly c337087043 [formerly a2010c729a]]]
Former-commit-id: 97eb7a2e5a5701cb524f44a9357594532e4b6186 [formerly 378c8cc0cd2c0288760022a651b07b1c9c74ada1] [formerly e9eb97a8fb [formerly 139466b9ef]]
Former-commit-id: e9eb97a8fb
Former-commit-id: a3fa77d796
|
2014-08-29 08:55:58 -05:00 |
|
Juliya Dynina
|
c761510eef
|
Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
Former-commit-id: 4ff21968d6 [formerly d911b87c7e] [formerly 5f001b7ad7] [formerly 5f001b7ad7 [formerly 169dc0ba43]] [formerly 4ff21968d6 [formerly d911b87c7e] [formerly 5f001b7ad7] [formerly 5f001b7ad7 [formerly 169dc0ba43]] [formerly 58a3df78a8 [formerly 5f001b7ad7 [formerly 169dc0ba43] [formerly 58a3df78a8 [formerly bb260c4003b477ca51cf5fd9c8d54275af906772]]]]]
Former-commit-id: 58a3df78a8
Former-commit-id: cd3efe3cf4 [formerly f1332a37cc] [formerly 62d2e61a75] [formerly e7b4cc402bb13601a1c55f01bc8b63333b815b7c [formerly d8e22d556662dfb3ac872fc696a556d59c038540] [formerly 62d2e61a75 [formerly 07b6109b5f]]]
Former-commit-id: 920e89d75b98ffbc5073e44d6de3b914ae4f2608 [formerly 6ab8833ed6da018338872e3739e186b679f1bcf8] [formerly 95f1799dc6 [formerly 9a5eb28213]]
Former-commit-id: 95f1799dc6
Former-commit-id: abb33a7cdd
|
2014-08-28 15:52:11 -05:00 |
|
Ana Rivera
|
75012171e7
|
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: ecd96b22f4 [formerly b03dd41331] [formerly e033ed5546] [formerly e033ed5546 [formerly 160dabc4d1]] [formerly ecd96b22f4 [formerly b03dd41331] [formerly e033ed5546] [formerly e033ed5546 [formerly 160dabc4d1]] [formerly 9af77831a6 [formerly e033ed5546 [formerly 160dabc4d1] [formerly 9af77831a6 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]]]]
Former-commit-id: 9af77831a6
Former-commit-id: b11dc7eccd [formerly ae4ea166aa] [formerly 2045699212] [formerly ace2d7cd56058b509c8557a4d07ed42df2ed66b6 [formerly 55222fba76e6458ccc65b959b86f2e7bff061cbc] [formerly 2045699212 [formerly fbe4d57f6b]]]
Former-commit-id: e249d10aaa806617d7cadd9eabbd4549662f94d5 [formerly f1c71d002deedd0c02aa5622f474ac29e9b2dd09] [formerly aec8eba1a7 [formerly dee335f370]]
Former-commit-id: aec8eba1a7
Former-commit-id: e57246c6ce
|
2014-08-28 18:38:26 +00:00 |
|
Roger Ferrel
|
bddbc0a564
|
Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec
Former-commit-id: bd600e2331 [formerly 60d6b770aa] [formerly 15c73be56c] [formerly 15c73be56c [formerly 6f8c6d6aa1]] [formerly bd600e2331 [formerly 60d6b770aa] [formerly 15c73be56c] [formerly 15c73be56c [formerly 6f8c6d6aa1]] [formerly ef5dfb1f93 [formerly 15c73be56c [formerly 6f8c6d6aa1] [formerly ef5dfb1f93 [formerly bcc9b0a6352151dfdf3ba75063bb87308cb162b4]]]]]
Former-commit-id: ef5dfb1f93
Former-commit-id: bf7fc6e2d5 [formerly 6fcac050be] [formerly ffa95bce90] [formerly e8f4ce59f8e57e67af55102c4302773cd2f611f1 [formerly a75847a14ce68662ce3ae2487c06dcc0a6e1e748] [formerly ffa95bce90 [formerly fe50853adb]]]
Former-commit-id: 4e6b670a3dca842a796771d3398baa0fe6062679 [formerly 8abe9b8b145e7dc278af60c6258a58d392c001a0] [formerly 89f66db462 [formerly 86d4730538]]
Former-commit-id: 89f66db462
Former-commit-id: 9322cc494f
|
2014-08-28 13:10:11 -05:00 |
|
David Friedman
|
3b1f4dc2f7
|
ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa
Former-commit-id: c165340a4f [formerly 16c903e2c5] [formerly 9c2545ed64] [formerly 9c2545ed64 [formerly de6e79f9e3]] [formerly c165340a4f [formerly 16c903e2c5] [formerly 9c2545ed64] [formerly 9c2545ed64 [formerly de6e79f9e3]] [formerly d5c086a022 [formerly 9c2545ed64 [formerly de6e79f9e3] [formerly d5c086a022 [formerly aca832a81bc18d954eadb51755ce04597cd264df]]]]]
Former-commit-id: d5c086a022
Former-commit-id: deaf3a428e [formerly 182df433a9] [formerly b2cc41f3de] [formerly 26f77790fc7b6c8f14e284f1ab55a4dab763dee7 [formerly a179ad829ac12e1773af11cae397893e6b1617b6] [formerly b2cc41f3de [formerly 6209bbc36f]]]
Former-commit-id: b6daa723d40f622217cc151e8c41ab0314e84731 [formerly 73ae135681bf633630b5cc3958129e68b1071732] [formerly e42ffa0ad4 [formerly 41b4886743]]
Former-commit-id: e42ffa0ad4
Former-commit-id: 3dbc4239e9
|
2014-08-28 18:08:23 +00:00 |
|
Daniel.Huffman
|
da92e559bf
|
ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e
Former-commit-id: 3c0c52255a [formerly 39f7795b7c] [formerly c3731d5622] [formerly c3731d5622 [formerly c89a7169b0]] [formerly 3c0c52255a [formerly 39f7795b7c] [formerly c3731d5622] [formerly c3731d5622 [formerly c89a7169b0]] [formerly ca2aa8811b [formerly c3731d5622 [formerly c89a7169b0] [formerly ca2aa8811b [formerly 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f]]]]]
Former-commit-id: ca2aa8811b
Former-commit-id: ff70deb291 [formerly eab387d780] [formerly eb9b743c46] [formerly 49e5aebb2ff7f604efc300cbf5344326fe52bbca [formerly 4e8f9df5152a35ae2d89acc7ab6ad942931f615c] [formerly eb9b743c46 [formerly dc2bc16bcc]]]
Former-commit-id: d6031aa51356ee45418c43546ac05c7b1e3842d5 [formerly 228c90a329fdf4dbbc995cb3df98fa83f3fcfc66] [formerly ff850b4cf0 [formerly b97ea429c3]]
Former-commit-id: 62cd160299800fc29e94eabd520908267e4ff03c [formerly ff850b4cf0]
Former-commit-id: 6aa67f4588
|
2014-08-28 17:20:30 +00:00 |
|
steve.naples
|
aca63e995b
|
ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138
Former-commit-id: 1d99c3e89c [formerly bf9924b0e9] [formerly 4205d83452] [formerly 4205d83452 [formerly 1856a05319]] [formerly 1d99c3e89c [formerly bf9924b0e9] [formerly 4205d83452] [formerly 4205d83452 [formerly 1856a05319]] [formerly ff52f1dc0a [formerly 4205d83452 [formerly 1856a05319] [formerly ff52f1dc0a [formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]]]]]
Former-commit-id: ff52f1dc0a
Former-commit-id: 6ebef19f10 [formerly 899ff32548] [formerly 1532c683a1] [formerly aa28752be4c8f85d35fe287d2e4fd3c2ce5289f6 [formerly 2916716519dd7ee38032637d8a99f6fb81e1e7ba] [formerly 1532c683a1 [formerly 211e9f7546]]]
Former-commit-id: 869833b2e06830c618516558e32cd5d54b1dd354 [formerly cc4eaa9f2dd1e8e914858e1e4828f637b78454d8] [formerly 03f50a48f1 [formerly 3f11e82772]]
Former-commit-id: 03f50a48f1
Former-commit-id: 33e95d1e49
|
2014-08-28 16:08:17 +00:00 |
|
David Friedman
|
289bf27e40
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: 3228a1557b [formerly bb421fd3e4] [formerly ea1e9feb1d] [formerly ea1e9feb1d [formerly a2dfe8e8f6]] [formerly 3228a1557b [formerly bb421fd3e4] [formerly ea1e9feb1d] [formerly ea1e9feb1d [formerly a2dfe8e8f6]] [formerly ea9230b37c [formerly ea1e9feb1d [formerly a2dfe8e8f6] [formerly ea9230b37c [formerly 6bfa1d6662b00925814be7126592bbe340651649]]]]]
Former-commit-id: ea9230b37c
Former-commit-id: c2dbfe51c6 [formerly 25e0bcdc6f] [formerly 10114b0bd1] [formerly 031f4edc021bad37bbc06d9ab831844341f68a85 [formerly 74a7d88387ec143a88a15084374737200a0e031a] [formerly 10114b0bd1 [formerly bc22f7309c]]]
Former-commit-id: 2647ebf849887eddfa78f5a036f1170ddae5c009 [formerly 2553d508e5b2d1bb6b928ee04f40220c66d897ac] [formerly 39c7024668 [formerly bfc3fa98b4]]
Former-commit-id: 39c7024668
Former-commit-id: 64b66c9dde
|
2014-08-28 15:43:32 +00:00 |
|
Brian.Dyke
|
75b49f0d37
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 07d163170f [formerly cbfd380b43] [formerly 76bd6575b6] [formerly 76bd6575b6 [formerly 47ae6015e5]] [formerly 07d163170f [formerly cbfd380b43] [formerly 76bd6575b6] [formerly 76bd6575b6 [formerly 47ae6015e5]] [formerly a24794ca7b [formerly 76bd6575b6 [formerly 47ae6015e5] [formerly a24794ca7b [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]]]]]
Former-commit-id: a24794ca7b
Former-commit-id: e9c3d0b262 [formerly 7288e9be2a] [formerly 065b05e38c] [formerly f7c6785d6d9d9e74292b4274283e724146705826 [formerly d87cfe22daebbd0f64708e2b5401b5a9bc43a95e] [formerly 065b05e38c [formerly 0e9a17540d]]]
Former-commit-id: fe0b41be97048432cd1086ea87818b355eb7fb5c [formerly 7849df2750377b7bb32208974c538f9b11a2620a] [formerly c5aec69ab3 [formerly bab69f3764]]
Former-commit-id: c5aec69ab3
Former-commit-id: 0ae9b53ca6
|
2014-08-28 11:39:48 -04:00 |
|
Steve Harris
|
c480eaafa5
|
Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2
Former-commit-id: 3046dbbd22 [formerly b551b21437] [formerly 080a50d28c] [formerly 080a50d28c [formerly 891019aadd]] [formerly 3046dbbd22 [formerly b551b21437] [formerly 080a50d28c] [formerly 080a50d28c [formerly 891019aadd]] [formerly d3b18900b3 [formerly 080a50d28c [formerly 891019aadd] [formerly d3b18900b3 [formerly 579781387325a36e27135b8384b2a8b14cb38317]]]]]
Former-commit-id: d3b18900b3
Former-commit-id: a6296f4e53 [formerly 1508060d35] [formerly 60d5eec1b0] [formerly dc72feac40ad82bdf4b69c33e5afa67460d4d7e2 [formerly 21a5baadcdeaf201b5a2a14f4cba871239a0bec7] [formerly 60d5eec1b0 [formerly 683c32dc70]]]
Former-commit-id: 5de15545e92157551a4da516374ecb3e2b58ae3b [formerly d634eda640b378264ee1e0f86ec9817a64114239] [formerly 02c026ccce [formerly 3efff5ee42]]
Former-commit-id: 02c026ccce
Former-commit-id: 108d38a6e2
|
2014-08-27 11:34:06 -05:00 |
|
Brian.Dyke
|
d238fe909f
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly aa83bf804f [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]]
Former-commit-id: aa83bf804f
Former-commit-id: a19455a35a [formerly 4a56b6f6e1] [formerly f90649d7e7] [formerly 68463cb724c8468f8978b5fb07a99445cf027313 [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3] [formerly f90649d7e7 [formerly f7f16ff9eb]]]
Former-commit-id: 44ca35c910c7065b51dd3a76485e002ac8fcb63b [formerly 2b5f667a78842762d60c8ab0ba442f22b9229095] [formerly 7e4ab705cc [formerly c0dc594eda]]
Former-commit-id: 1cde9cd7bdfb3330564a42c1fce83730b50bbe4c [formerly 7e4ab705cc]
Former-commit-id: 2da6c7b93b
|
2014-08-27 11:19:19 -04:00 |
|
Brian.Dyke
|
5851fb235d
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 89044a96eb [formerly acc3321457] [formerly 489fec4b25] [formerly 489fec4b25 [formerly 86f0ed23c1]] [formerly 89044a96eb [formerly acc3321457] [formerly 489fec4b25] [formerly 489fec4b25 [formerly 86f0ed23c1]] [formerly b3767167c7 [formerly 489fec4b25 [formerly 86f0ed23c1] [formerly b3767167c7 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]]]]
Former-commit-id: b3767167c7
Former-commit-id: 9f66f958e5 [formerly ef2afe4f88] [formerly 1b9a28cc62] [formerly 01cd756b7e21e488ad80088cd45376d1281f1be7 [formerly dfa43aa5c4d4a07843b46cd3b23eed8a26739086] [formerly 1b9a28cc62 [formerly f2b9203001]]]
Former-commit-id: 3ac0ccec04d23373bda6397d91ebf1314fa9725f [formerly ab64fc858eafb7e5c8697e4fe618a1b8621ed5d0] [formerly 16dc3b41de [formerly 677ce2fb94]]
Former-commit-id: 16dc3b41de
Former-commit-id: bcdb3d4c19
|
2014-08-26 13:31:34 -04:00 |
|
Brian.Dyke
|
c6a1ff9aff
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 305355eded [formerly b99d31c7e6] [formerly 8ac44dfbd3] [formerly 8ac44dfbd3 [formerly de56ccebc0]] [formerly 305355eded [formerly b99d31c7e6] [formerly 8ac44dfbd3] [formerly 8ac44dfbd3 [formerly de56ccebc0]] [formerly 59bacf90ac [formerly 8ac44dfbd3 [formerly de56ccebc0] [formerly 59bacf90ac [formerly b13e744dbbcc332b9efd0799e87390bdf9bb1df3]]]]]
Former-commit-id: 59bacf90ac
Former-commit-id: 74d2f5ddb1 [formerly c2b8aa9023] [formerly dc14c2e6ce] [formerly 25672a9e591d6e0033849ebe968ddab7606f648a [formerly 1aa12a57a91c266d9cae0f47f1830ad807f2a1d0] [formerly dc14c2e6ce [formerly 8c803e81d3]]]
Former-commit-id: 1cfddba94302bd23ab88f5096eb0869a1cce3676 [formerly d248a5cd3c84f91c9c7def176fde5802665acfbc] [formerly 6c1e526daf [formerly c08a724cf0]]
Former-commit-id: 0896bac2626fdbe7b373a339c805b5c783c41c71 [formerly 6c1e526daf]
Former-commit-id: eb989298c3
|
2014-08-26 10:56:45 -04:00 |
|
Daniel.Huffman
|
00057da8a8
|
ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0
Former-commit-id: c850d45689 [formerly d7c82cf4be] [formerly e2e132e7a5] [formerly e2e132e7a5 [formerly 8962a069be]] [formerly c850d45689 [formerly d7c82cf4be] [formerly e2e132e7a5] [formerly e2e132e7a5 [formerly 8962a069be]] [formerly d1cd90b487 [formerly e2e132e7a5 [formerly 8962a069be] [formerly d1cd90b487 [formerly 2107976bd25c429521d4df7a92a3726a38806ba3]]]]]
Former-commit-id: d1cd90b487
Former-commit-id: 42dd55986f [formerly ebae452135] [formerly 7d09253674] [formerly bac93a60f10146e61adff4ed23de8283399ba11e [formerly 1d0b849f95b96d174f8fe7e2dac8ce729d2a1e58] [formerly 7d09253674 [formerly 64672eb478]]]
Former-commit-id: 9ca87da55399673b2da60658ab6faf67d4524f63 [formerly 9d4bcd480a7638756243875bdd8b10b8f6045689] [formerly 8c6fd18ece [formerly ea8ec5fbe7]]
Former-commit-id: 8c6fd18ece
Former-commit-id: 75cbc60355
|
2014-08-26 13:30:09 +00:00 |
|
Richard Peter
|
db5eae3d88
|
Merge "Issue #3537 Fixed dirPattern in category Local." into omaha_14.2.4
Former-commit-id: ca3cd8faf5 [formerly 6396f11532] [formerly ab7facb903] [formerly ab7facb903 [formerly 4ba39c5e56]] [formerly ca3cd8faf5 [formerly 6396f11532] [formerly ab7facb903] [formerly ab7facb903 [formerly 4ba39c5e56]] [formerly 008a3e8f80 [formerly ab7facb903 [formerly 4ba39c5e56] [formerly 008a3e8f80 [formerly 5bb3f4a1215902e867d3e9ec5ca1d122067afd7e]]]]]
Former-commit-id: 008a3e8f80
Former-commit-id: 6477b1ef1e [formerly 7fc06eff0d] [formerly 17c2c42cd2] [formerly 53d43494db62632f51bce0d96c82735309c7124c [formerly db9e0e2a7fdda0d46fab9872d270205026e87d41] [formerly 17c2c42cd2 [formerly 2dd7596b68]]]
Former-commit-id: 3a5b2784527ba2556c15bf7a002b9c6b6854e2e1 [formerly 92d5a0993e2d368b76ebf331193aa7969087caf7] [formerly 752f328338 [formerly 8e073ab401]]
Former-commit-id: 752f328338
Former-commit-id: 02076146f3
|
2014-08-25 14:24:27 -05:00 |
|
Ron Anderson
|
847df4f9ea
|
Merge "Issue #3500 back port of loadConfig.py to fix gfe starup issue" into omaha_14.2.4
Former-commit-id: a61887db31 [formerly dee9a699ad] [formerly 03173a9fe7] [formerly 03173a9fe7 [formerly 4e6bbb4be4]] [formerly a61887db31 [formerly dee9a699ad] [formerly 03173a9fe7] [formerly 03173a9fe7 [formerly 4e6bbb4be4]] [formerly 4285719a08 [formerly 03173a9fe7 [formerly 4e6bbb4be4] [formerly 4285719a08 [formerly ae980bfccfedab3091b2708fae0dc36764dbffcb]]]]]
Former-commit-id: 4285719a08
Former-commit-id: 40332f6e3e [formerly 1e3a94e3e4] [formerly fe93cb7510] [formerly 5a15bd886a03ffd97902c74fd4481b108910137f [formerly 06e2debcd2974ef2d50793405e7728d260c70777] [formerly fe93cb7510 [formerly 6c3cafda59]]]
Former-commit-id: 80a913c6d84d8db67aba06262c15a441bbb7a54a [formerly b90a38bfc9b4cb38537b03a88e5468d30019bf90] [formerly a46f13d161 [formerly 566db58f13]]
Former-commit-id: a46f13d161
Former-commit-id: fc6ff76874
|
2014-08-25 14:04:41 -05:00 |
|
Brian Clements
|
f15d60caeb
|
Issue #3500 back port of loadConfig.py to fix gfe starup issue
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7
Former-commit-id: 6bdec13124 [formerly 5d794a5135] [formerly 960eb2dc29] [formerly 960eb2dc29 [formerly 4314f71387]] [formerly 6bdec13124 [formerly 5d794a5135] [formerly 960eb2dc29] [formerly 960eb2dc29 [formerly 4314f71387]] [formerly cf671dcda8 [formerly 960eb2dc29 [formerly 4314f71387] [formerly cf671dcda8 [formerly 2a0af03242692708b3e752417ca7d60d28520768]]]]]
Former-commit-id: cf671dcda8
Former-commit-id: 678bce9591 [formerly cb34376804] [formerly 253b14b895] [formerly 97e9c75a75cb4ca93b06a59741911421b47159d5 [formerly ad4290afd9237cad2ca05f14d0e5d7191bb86b8b] [formerly 253b14b895 [formerly f9756abf0a]]]
Former-commit-id: 97de2960ed0900458be1e25b2e6c9ce002d135d1 [formerly 1fb9f395c099428c7cfe4498866fb60825fb08d7] [formerly 05bfc2943c [formerly 7bc93588a1]]
Former-commit-id: 05bfc2943c
Former-commit-id: 776781b39c
|
2014-08-25 13:34:36 -05:00 |
|
Roger Ferrel
|
ee7c823f12
|
Issue #3537 Fixed dirPattern in category Local.
Former-commit-id: da06285f98 [formerly eb6992b3fa] [formerly 1ff321ce51] [formerly 1ff321ce51 [formerly c7a6040792]] [formerly da06285f98 [formerly eb6992b3fa] [formerly 1ff321ce51] [formerly 1ff321ce51 [formerly c7a6040792]] [formerly e451dd2814 [formerly 1ff321ce51 [formerly c7a6040792] [formerly e451dd2814 [formerly d40736ed992300be32ed4a62511fa436e9d167af]]]]]
Former-commit-id: e451dd2814
Former-commit-id: d321a1ccf5 [formerly a2d92f8552] [formerly 3d3f9cfb8c] [formerly 3c6eab7f5659fbdcb6e36300f39deb46e99717e3 [formerly dce5cb1b876921fa48d76b01c9951abb227edc02] [formerly 3d3f9cfb8c [formerly 6f566c0f38]]]
Former-commit-id: 21022fb43578a96d471e6b0e0f44f6d96878d22c [formerly 4e526b9ac8cf4abf3e1c0daffa70d6e08a61d447] [formerly 7a7a770dc6 [formerly 7e3024f4f2]]
Former-commit-id: 7a7a770dc6
Former-commit-id: cb510287d3
|
2014-08-25 13:23:44 -05:00 |
|
Nate Jensen
|
415c3f9d0d
|
Merge "Issue #3500 remove locking on osgi internals, rework gfe client startup" into omaha_14.2.4
Former-commit-id: c79a704e04 [formerly 41a7e2dbcd] [formerly 0852d804ba] [formerly 0852d804ba [formerly 5e46c55a76]] [formerly c79a704e04 [formerly 41a7e2dbcd] [formerly 0852d804ba] [formerly 0852d804ba [formerly 5e46c55a76]] [formerly d66ac29640 [formerly 0852d804ba [formerly 5e46c55a76] [formerly d66ac29640 [formerly bb08cb510dc3d774e040b7d3a164dfa1d581aa1c]]]]]
Former-commit-id: d66ac29640
Former-commit-id: bc9cd1710b [formerly 702239de9f] [formerly d824e365d1] [formerly e85279b2fceda75b9efc91a3b67d774600e4524f [formerly 4fa0bfb69b17bae7253b0667ffaee25774b64820] [formerly d824e365d1 [formerly 5c943c5ddc]]]
Former-commit-id: b4a509f92858f6db4b2ecfaed8cab2f176c05427 [formerly d618491bf8793852bfbd3ec1383e25783451911a] [formerly 6bb1e7d4bd [formerly 18902f8c9a]]
Former-commit-id: 6bb1e7d4bd
Former-commit-id: 81796e4d08
|
2014-08-25 13:12:46 -05:00 |
|
Steve Harris
|
255192041c
|
Merge branch 'master_14.2.2' (14.2.2-29) into omaha_14.2.2
Former-commit-id: f9a912d3e5 [formerly 8a684bb351] [formerly 8aadfe944a] [formerly 8aadfe944a [formerly a03b5201cb]] [formerly f9a912d3e5 [formerly 8a684bb351] [formerly 8aadfe944a] [formerly 8aadfe944a [formerly a03b5201cb]] [formerly d850919303 [formerly 8aadfe944a [formerly a03b5201cb] [formerly d850919303 [formerly 67c81cedb7321baad8dcf5fb4cea21ac152d2dcd]]]]]
Former-commit-id: d850919303
Former-commit-id: a60a46a7d9 [formerly 2560ce6724] [formerly 28937f26bc] [formerly 5d7d4dd8324c592df9df0ced8ac8deb1bf0e2c60 [formerly 9438eed61e44da4ec8f772bce9429f8e45fdf8f7] [formerly 28937f26bc [formerly 121a8ce866]]]
Former-commit-id: 46772db67a267cf4047f910662e47a83775349b1 [formerly e99ab9da49ecb0f8b1ae915a0ce3a8e55cb043fb] [formerly f4883fed1e [formerly a45850d88e]]
Former-commit-id: f4883fed1e
Former-commit-id: 325a595636
|
2014-08-25 08:19:50 -05:00 |
|
Brian.Dyke
|
2b2385cc37
|
Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: 6434bfcf3c [formerly aecf73e71a] [formerly a841eb53e5] [formerly a841eb53e5 [formerly a4376ec79f]] [formerly 6434bfcf3c [formerly aecf73e71a] [formerly a841eb53e5] [formerly a841eb53e5 [formerly a4376ec79f]] [formerly 0fbc5269ea [formerly a841eb53e5 [formerly a4376ec79f] [formerly 0fbc5269ea [formerly e673b3ff82b52be4cd4fbe2dab0859b98678f6ef]]]]]
Former-commit-id: 0fbc5269ea
Former-commit-id: 0bfd904a66 [formerly f72c19fd3c] [formerly caa50716ff] [formerly c2c5adbff56774a18b0530ca40838e4167454f77 [formerly 6d6fe3691f712c1bf4868acb2bc3528ca639977e] [formerly caa50716ff [formerly 13d523eede]]]
Former-commit-id: a2f80da8dddc0dd903a0af7ac4e5bc8b5e620fb5 [formerly 23276a6c95a3ff3542db1d52456372fdad964d1a] [formerly d9ac0d95d4 [formerly 20c4fb88d5]]
Former-commit-id: d9ac0d95d4
Former-commit-id: 9a5fa53446
|
2014-08-22 16:40:51 -04:00 |
|
Brian.Dyke
|
6a99c2269e
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: e6e748f80c [formerly 6402cb7d89] [formerly 2ddc920a4a] [formerly 2ddc920a4a [formerly 325887e605]] [formerly e6e748f80c [formerly 6402cb7d89] [formerly 2ddc920a4a] [formerly 2ddc920a4a [formerly 325887e605]] [formerly dd9d7133d9 [formerly 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]]]
Former-commit-id: dd9d7133d9
Former-commit-id: b1125b7ead [formerly e348a6abc7] [formerly c8e9153884] [formerly aeb4c05a55d78fcd7c75024d8266f07f6153e495 [formerly 7dbc20e2697aab4991870bf8493b74b08acbe56b] [formerly c8e9153884 [formerly 1839b614df]]]
Former-commit-id: 4ebaf1487954a27857fde0b53c4ede7217a27c50 [formerly 85ccff40908964b07fef1c572de049c609434728] [formerly 27372f098c [formerly cd1b914f50]]
Former-commit-id: 27372f098c
Former-commit-id: 272905b186
|
2014-08-22 14:16:22 -04:00 |
|