Nate Jensen
|
c4f408ecd1
|
Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
Former-commit-id: 585516210d [formerly a690b853bb] [formerly 0f35426ad0] [formerly 585516210d [formerly a690b853bb] [formerly 0f35426ad0] [formerly c23071f48c [formerly 0f35426ad0 [formerly 9e0f31fc6601a39938deeaf7e1c8ed8849e43288]]]]
Former-commit-id: c23071f48c
Former-commit-id: 6b60f3cab1 [formerly e5f28ab1f9] [formerly 224426c54bdc59844b7fe1584ba3efbfd084b116 [formerly d9d0068a1c]]
Former-commit-id: a7930718e1b56b1f10f592043a9840a8ad65d172 [formerly fd931efdf2]
Former-commit-id: ea4fd384ca
|
2014-09-02 17:34:59 -05:00 |
|
Mark Peters
|
9af2093ebf
|
Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times
Change-Id: I68642e05ce970545a516d4fab1492a860c530032
Former-commit-id: 9259187266 [formerly 447986eed3] [formerly 06b98bb48a] [formerly 9259187266 [formerly 447986eed3] [formerly 06b98bb48a] [formerly ee36d09cb0 [formerly 06b98bb48a [formerly 725354074d54112c8658dc34a8ac564739acbebb]]]]
Former-commit-id: ee36d09cb0
Former-commit-id: cda9e678ce [formerly 8ace5b852c] [formerly 77c8cf7908b9938669d07f1218c604ca9a22cca8 [formerly a3feb0de78]]
Former-commit-id: 2f22b952a1904df9821cbfd7543994a5d0efe440 [formerly e7e58b4e78]
Former-commit-id: 72184dbcaf
|
2014-09-02 16:31:44 -05:00 |
|
Ben Steffensmeier
|
afd34c4e2a
|
Omaha #3390 Remove references to deprecated API.
Former-commit-id: 59e6ec282f [formerly 950075dc59] [formerly 1d2144e840] [formerly 59e6ec282f [formerly 950075dc59] [formerly 1d2144e840] [formerly e32037b42a [formerly 1d2144e840 [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]]]]
Former-commit-id: e32037b42a
Former-commit-id: 31f58cc68e [formerly 068653ac95] [formerly 978887cb907a630899b357400937ea888e94a9f4 [formerly b77166c26e]]
Former-commit-id: 7c80d8b87912c05d70384388c8b2a77908c257b7 [formerly 6e1981d6f6]
Former-commit-id: 5b35e526f4
|
2014-09-02 15:39:45 -05:00 |
|
Brian.Dyke
|
67d4a5f91b
|
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: bdba05f6b1 [formerly 9e156775e5] [formerly fd8ad016ef] [formerly bdba05f6b1 [formerly 9e156775e5] [formerly fd8ad016ef] [formerly 14e64881a1 [formerly fd8ad016ef [formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]]]]
Former-commit-id: 14e64881a1
Former-commit-id: 00175029c5 [formerly 75fccb7361] [formerly 1eb2f1f9e0f92550688af61f814e53ebcd21e85a [formerly 43c9dfa397]]
Former-commit-id: 481daae46a50a3916d1fdb63ccaf21ee51a408cd [formerly 2d9a8a8b40]
Former-commit-id: e8143081cb
|
2014-09-02 16:32:54 -04:00 |
|
Brian.Dyke
|
3539b14e3b
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 9105ef9aa2 [formerly e425e5bf8c] [formerly f0875e724f] [formerly 9105ef9aa2 [formerly e425e5bf8c] [formerly f0875e724f] [formerly 611e036e75 [formerly f0875e724f [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]]]
Former-commit-id: 611e036e75
Former-commit-id: 0015f2440e [formerly 3b9653ef00] [formerly c73653650f9ff8397fc5371a4686056fcc738000 [formerly caf5f778e9]]
Former-commit-id: 8382ee6ae605cca7bbd88f333d4d1875fc119a63 [formerly 4425e3db61]
Former-commit-id: 0d6ef0345d
|
2014-09-02 16:30:51 -04:00 |
|
Benjamin Phillippe
|
349af228f9
|
Issue #3560 Registry objects not re-sent after fully sync
Change-Id: Id38989cf953aacb985d627422c043f8768df2ed0
Former-commit-id: 0c5dad994f [formerly 30f3289917] [formerly 7265bf54c7] [formerly 0c5dad994f [formerly 30f3289917] [formerly 7265bf54c7] [formerly 955ac3a670 [formerly 7265bf54c7 [formerly 15e57fc58bee1045c5574e4d66a727a672ac83cb]]]]
Former-commit-id: 955ac3a670
Former-commit-id: 12b6ede128 [formerly df919cf8e3] [formerly 1b95f465a554716aafbebe611aaa9449d3b2ae13 [formerly d6c265e78e]]
Former-commit-id: 170f255dd1306f1b971bc3433318ad78941e71a0 [formerly 6d47294138]
Former-commit-id: 2e91209f47
|
2014-09-02 14:46:50 -05:00 |
|
Richard Peter
|
1fe19c7c4a
|
Merge "Omaha #3549 improve error message" into omaha_14.4.1
Former-commit-id: a9c5622575 [formerly d968b5085d] [formerly 3c874e1aa1] [formerly a9c5622575 [formerly d968b5085d] [formerly 3c874e1aa1] [formerly 7dc4327ffa [formerly 3c874e1aa1 [formerly 6e8ad4c9e2046ac950bbf166a09492a69c88cb7e]]]]
Former-commit-id: 7dc4327ffa
Former-commit-id: 87ee958c33 [formerly b9db837e14] [formerly 432a6dbd7a4b5d78c1acca24871270eef299a2fd [formerly 388c1ca919]]
Former-commit-id: 018c5716f877ec1e71fd31c419bd6d8e83649817 [formerly 6bee61c16f]
Former-commit-id: d9acda4485
|
2014-09-02 14:25:18 -05:00 |
|
Brian.Dyke
|
c794f123cf
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: a76150b1a7 [formerly 65f8fc89f0] [formerly 368f80f220] [formerly a76150b1a7 [formerly 65f8fc89f0] [formerly 368f80f220] [formerly b1dbaa0b50 [formerly 368f80f220 [formerly f9daf7d6e906904e96438fabc510e24ff66536d4]]]]
Former-commit-id: b1dbaa0b50
Former-commit-id: 8f03fd0274 [formerly 045647bb37] [formerly 43f0dc59c33b7743e63ed6a533b0ca2012370c82 [formerly a1889cd15e]]
Former-commit-id: c433f75ba5ca6d60a2ce55518254ef98b080caa8 [formerly efb7dcb397]
Former-commit-id: cd6bf05d34
|
2014-09-02 15:09:06 -04:00 |
|
Qinglu.Lin
|
175af9a9d3
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: dda32f85e9 [formerly b32ea40289] [formerly 2374673f8d] [formerly dda32f85e9 [formerly b32ea40289] [formerly 2374673f8d] [formerly ae13ea419e [formerly 2374673f8d [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]]]
Former-commit-id: ae13ea419e
Former-commit-id: 5c521a214c [formerly 3fcdc279ea] [formerly 153a4d5b66ab5d399ab180ca9af559bd33c0b1bf [formerly 075df9d234]]
Former-commit-id: 04e6c13acdb23e049d0e8a380998b12c7056105a [formerly 415af39911]
Former-commit-id: 7ec0ec8877
|
2014-09-02 14:37:19 -04:00 |
|
Richard Peter
|
02e6cd89bf
|
Merge "Omaha #2926 switched textdb to thrift client" into omaha_14.4.1
Former-commit-id: 8e191c2c60 [formerly 612990b3ed] [formerly 7628a0a56a] [formerly 8e191c2c60 [formerly 612990b3ed] [formerly 7628a0a56a] [formerly 0f94b663a4 [formerly 7628a0a56a [formerly 80294bbd891edde5b190941175f73d634f1a3e08]]]]
Former-commit-id: 0f94b663a4
Former-commit-id: 58222f5a6a [formerly e3e9368411] [formerly d01294032fb4e66d3e529c0bea83d466743d41aa [formerly 6151d549ce]]
Former-commit-id: a6d9f52fdb26021f877a9cd9e5aa53e3c3c8c52e [formerly eca48d7b90]
Former-commit-id: bb5b769b96
|
2014-09-02 12:45:37 -05:00 |
|
Nate Jensen
|
a1b7bb9215
|
Omaha #3549 improve error message
Change-Id: I54cdefd3b77fa5ad8eba9aad6ae8c93b7bd0a67d
Former-commit-id: 32e40b5903 [formerly 3cf81ab39e] [formerly fa330b698d] [formerly 32e40b5903 [formerly 3cf81ab39e] [formerly fa330b698d] [formerly 37501b884a [formerly fa330b698d [formerly 369867e18b5209895137f5e4121fa06bfa2858c7]]]]
Former-commit-id: 37501b884a
Former-commit-id: bec31cf645 [formerly 635604b7a9] [formerly 295230b31262a47d94f4c22e8e5459e6e428d04e [formerly 11b4f270e6]]
Former-commit-id: f9f2016ad6a5c4cbe565f5de2707ff227cca22eb [formerly 7336cbb500]
Former-commit-id: 78b9181a68
|
2014-09-02 12:38:04 -05:00 |
|
Richard Peter
|
29ec2faff6
|
Merge "Omaha #3549 improve acarssounding error message" into omaha_14.4.1
Former-commit-id: 245c304d6c [formerly 78550587d8] [formerly 1ebcacee88] [formerly 245c304d6c [formerly 78550587d8] [formerly 1ebcacee88] [formerly 09a044b9af [formerly 1ebcacee88 [formerly 4d0cb95dfed73beeb51e15d753b76c315877d2ea]]]]
Former-commit-id: 09a044b9af
Former-commit-id: b12762b5eb [formerly e9114850ac] [formerly 1d1c404038e0117789669999bd6ba53869c133fd [formerly 7fa3a9b834]]
Former-commit-id: 242a11e31e23ff27b218ac4ac2badfba5c747ab4 [formerly 33b9f58bc3]
Former-commit-id: 76be4ae710
|
2014-09-02 12:32:39 -05:00 |
|
Ron Anderson
|
dd329dbd57
|
Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce
Former-commit-id: c5a32980d6 [formerly c7fbca0298] [formerly 46c62a1db6] [formerly c5a32980d6 [formerly c7fbca0298] [formerly 46c62a1db6] [formerly 434d412882 [formerly 46c62a1db6 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]]]]
Former-commit-id: 434d412882
Former-commit-id: 215d5f262e [formerly 19ce2bb34e] [formerly d4fadbd148424d34474cdcf3ba53cd32ad36b1f0 [formerly 24fba5cc20]]
Former-commit-id: 00a79119c6c0303cfa622498ee2804eb04c1903f [formerly cad80d1060]
Former-commit-id: 699fe1637e
|
2014-09-02 12:21:42 -05:00 |
|
Richard Peter
|
288a906bbd
|
Merge "Issue #3560 Fix for registry memory issue" into omaha_14.2.4
Former-commit-id: 9489243db9 [formerly abc807850f] [formerly be2474da34] [formerly 9489243db9 [formerly abc807850f] [formerly be2474da34] [formerly 0e29b2d17f [formerly be2474da34 [formerly 6789576e88de568c6014c29d099349cec40c7c74]]]]
Former-commit-id: 0e29b2d17f
Former-commit-id: 0226ed3c06 [formerly 050e1f67d3] [formerly d0d9235810b10eed90b7d86cae612e9695672528 [formerly e992fee66a]]
Former-commit-id: d2acb3e7d0c61d6e8a011e66d89f407ddca90721 [formerly 3408442222]
Former-commit-id: 063bfe0a8a
|
2014-09-02 12:15:38 -05:00 |
|
Ron Anderson
|
10e9ad4ca8
|
Merge "Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective" into omaha_14.4.1
Former-commit-id: 63ab6bd9a9 [formerly 8d9741bd83] [formerly 6a5d4acf7c] [formerly 63ab6bd9a9 [formerly 8d9741bd83] [formerly 6a5d4acf7c] [formerly aa6835147b [formerly 6a5d4acf7c [formerly 31578a50044053da2ecf14697764bfac2ee8ac8d]]]]
Former-commit-id: aa6835147b
Former-commit-id: ac506c4706 [formerly f27986f541] [formerly b1cd47a3d83b85b71256a99afa990cb682a5acff [formerly 017378f646]]
Former-commit-id: 9af96902654c0f6e23f6c8bc3a8528d55566d1b3 [formerly 8ab30a7e02]
Former-commit-id: c13e748b6c
|
2014-09-02 12:08:44 -05:00 |
|
Mark Peters
|
fc1bf53dd8
|
Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: Ib0aa88dd3341ae65aef9b2b02ffbd1645510b95e
Former-commit-id: 5f08576217 [formerly be6dae0cf9] [formerly ad994bc4c6] [formerly 5f08576217 [formerly be6dae0cf9] [formerly ad994bc4c6] [formerly 53869a4b0b [formerly ad994bc4c6 [formerly 07b54b870e36f37b909d9e7da1f1da4d181b06b0]]]]
Former-commit-id: 53869a4b0b
Former-commit-id: d999c9b971 [formerly 6ddbbc366a] [formerly 352eadb0bfcd10c4a3285b275cd239dde33fbc0b [formerly 2c02132ec0]]
Former-commit-id: 7c5ff5e2e0a4d9dfc3584b9b8c912a58cb941ae6 [formerly ae87858e3d]
Former-commit-id: 3a8e2b71fd
|
2014-09-02 11:38:06 -05:00 |
|
Nate Jensen
|
75dac9ed3b
|
Omaha #3549 improve acarssounding error message
Change-Id: I850eb6bbcd825bee26f0e93226b10d077378dacf
Former-commit-id: 85696fe8d4 [formerly 6838a4d8cc] [formerly 8570cad6c6] [formerly 85696fe8d4 [formerly 6838a4d8cc] [formerly 8570cad6c6] [formerly 82ef4c1646 [formerly 8570cad6c6 [formerly 16e66726bd5a8f20d6de21708c7f3372a046cea8]]]]
Former-commit-id: 82ef4c1646
Former-commit-id: 6e328368a3 [formerly c7fdb67228] [formerly ee661ee4461cd4664ce88dce5e2346ddcda5f2bd [formerly eed90eceeb]]
Former-commit-id: b62a17c7a5fd322d3802ea707765eb9d65910d12 [formerly fddcabac0a]
Former-commit-id: 0189b9da69
|
2014-09-02 11:21:10 -05:00 |
|
Greg Armendariz
|
a38bb1fdd3
|
Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1
Former-commit-id: 964ad44a4d [formerly a9f6d3528c] [formerly 33b0ac3811] [formerly 964ad44a4d [formerly a9f6d3528c] [formerly 33b0ac3811] [formerly b229adbf38 [formerly 33b0ac3811 [formerly 2a4e26c1be0118f71e18a2c5bfa8777163a97d30]]]]
Former-commit-id: b229adbf38
Former-commit-id: 937866d9fc [formerly d63a9da4d6] [formerly 3425e01542aa3ace9515c5168fc3318fc6f9f911 [formerly edb50956c8]]
Former-commit-id: 22848ce1b68d7e8f411bd8a4e15a3940e1ef4a36 [formerly a2aa3fa6ff]
Former-commit-id: 8566996f06
|
2014-09-02 10:40:13 -05:00 |
|
Nate Jensen
|
817ef8e8db
|
Merge "Omaha #3356 fix cave startup" into omaha_14.4.1
Former-commit-id: 8b646ba31d [formerly 3258b9a2b2] [formerly 5247f4833f] [formerly 8b646ba31d [formerly 3258b9a2b2] [formerly 5247f4833f] [formerly 653d594382 [formerly 5247f4833f [formerly e3c3d979ba7dcb46d2af716aa73e05c67f0dd2ba]]]]
Former-commit-id: 653d594382
Former-commit-id: 9fe09a5a4a [formerly 9067556a0e] [formerly 16cdf4e9bf10ff7dd7304857d8a8edd3a9887132 [formerly a63f5ee67b]]
Former-commit-id: a4957d53386d3437cf9be10914fe20459ec96bed [formerly 8078915092]
Former-commit-id: 0c55719688
|
2014-09-02 10:14:08 -05:00 |
|
Brian Clements
|
26bbbcafc6
|
Omaha #3573 fixed clean in collaboration dataserver ant script
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a
Former-commit-id: 051344f98f [formerly eb84b255b0] [formerly 9fe49043e7] [formerly 051344f98f [formerly eb84b255b0] [formerly 9fe49043e7] [formerly 23f1f7b2b6 [formerly 9fe49043e7 [formerly d2bfe367c9753fc4a2db181c7966179a20713a02]]]]
Former-commit-id: 23f1f7b2b6
Former-commit-id: efa02bf1b0 [formerly 8da4a4ccf4] [formerly c7bdc30721b964ac4e5ff63f21d1f375ed5ec691 [formerly 7a29eef035]]
Former-commit-id: 73025c41236b9dc6b94fbb2a7c79208b8fbdb4bb [formerly e56c909c26]
Former-commit-id: 54a627e05a
|
2014-09-02 10:04:39 -05:00 |
|
Benjamin Phillippe
|
bca70fb7fa
|
Issue #3560 Fix for registry memory issue
Former-commit-id: c00e99fa33 [formerly 12914fb1e5] [formerly ab8b2ef473] [formerly c00e99fa33 [formerly 12914fb1e5] [formerly ab8b2ef473] [formerly 2da57d3bc2 [formerly ab8b2ef473 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]]]]
Former-commit-id: 2da57d3bc2
Former-commit-id: f8eac1c5dd [formerly c180ce2758] [formerly 297c1c315b814d7db8fde2a56eeb56d15518cf06 [formerly 393c67dbe9]]
Former-commit-id: 35b5f0063d9854e2e07156583373ec6fa6d63dbf [formerly 565c858c3e]
Former-commit-id: 94ffd5d5f0
|
2014-09-02 10:00:35 -05:00 |
|
Nate Jensen
|
55b8cace97
|
Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
Former-commit-id: 2d5df2705f [formerly e673ed62bd] [formerly 2c209af1fa] [formerly 2d5df2705f [formerly e673ed62bd] [formerly 2c209af1fa] [formerly fe457e89a7 [formerly 2c209af1fa [formerly 09d7406f13949cf6a90164b06742c80ba2e18110]]]]
Former-commit-id: fe457e89a7
Former-commit-id: 23e2185306 [formerly 675bf92355] [formerly d45ff0db4fb7b24b0d0dac7dd89e774e93c37f76 [formerly 5661124038]]
Former-commit-id: d73ffe2ac6152190335275c8b09eca38523eb2c5 [formerly 84a107c8fa]
Former-commit-id: 070ef331b9
|
2014-09-02 09:53:25 -05:00 |
|
Nate Jensen
|
8fce75eb4c
|
Merge "Omaha #3459 Ensure font is initialized before queryJob runs, Additional refactoring to someday allow ZoneSelectorResource to use more common code." into omaha_14.4.1
Former-commit-id: 9911f52bba [formerly 3efe4cf3b0] [formerly c4333e030c] [formerly 9911f52bba [formerly 3efe4cf3b0] [formerly c4333e030c] [formerly 13f1a5a8ab [formerly c4333e030c [formerly 172d733902e6430de4f776eed3ad4cd6a94164a5]]]]
Former-commit-id: 13f1a5a8ab
Former-commit-id: 8ce67a74fc [formerly ce408af16d] [formerly d4c7add5b764b550d58d33f2f4196259ef2e45ee [formerly d7a2ff8336]]
Former-commit-id: eeef362c82e91dc32f6c0c742ffa9f5f3910e7e0 [formerly f913771eb0]
Former-commit-id: 037859fb38
|
2014-09-02 09:52:38 -05:00 |
|
Nate Jensen
|
11a7a988e0
|
Omaha #3356 fix cave startup
Change-Id: Id05d1439ba4f3b5064887b46256f4ade4523f595
Former-commit-id: c77003fe38 [formerly 9bf9e3a658] [formerly 4395ab6f11] [formerly c77003fe38 [formerly 9bf9e3a658] [formerly 4395ab6f11] [formerly ef99d43451 [formerly 4395ab6f11 [formerly d326ee1a73a852e5534e76bf2148afd7646adb7e]]]]
Former-commit-id: ef99d43451
Former-commit-id: 52c35a13e4 [formerly b2d1d16230] [formerly 0df3a1960400546ca8de64d6de8790e6692bf51e [formerly fe789cce26]]
Former-commit-id: 125156870dc75ed8a982849f77f0d35a67186be9 [formerly 20aa52b2ed]
Former-commit-id: 9f908d764c
|
2014-09-02 09:50:08 -05:00 |
|
Dave Hladky
|
24119a4273
|
Issue #3564 Allow for un-authenicated WFS HTTPS connections.
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a
Former-commit-id: 4b22309742 [formerly 534b784843] [formerly 9c3b002990] [formerly 4b22309742 [formerly 534b784843] [formerly 9c3b002990] [formerly 82fd7189b9 [formerly 9c3b002990 [formerly 7afe5332fcf41bbc8bb2411944584405f3ba686a]]]]
Former-commit-id: 82fd7189b9
Former-commit-id: 77b4003cf8 [formerly 80d0e2594f] [formerly cb2ec0507bd999daab7cd2f39d5b6532cfef68ed [formerly 9ac2a3adee]]
Former-commit-id: f282cbe079f9369b49673515fe4fe83dd5283e90 [formerly c1bf96b142]
Former-commit-id: f165391a1b
|
2014-09-02 09:38:21 -05:00 |
|
Richard Peter
|
ec4e085fbe
|
Merge "Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml." into omaha_14.4.1
Former-commit-id: 7a17f81e58 [formerly 5db143cd92] [formerly 6f66071eca] [formerly 7a17f81e58 [formerly 5db143cd92] [formerly 6f66071eca] [formerly 40917b6118 [formerly 6f66071eca [formerly f7aa38e6092e59e314fedad22829eed9e5c22ad2]]]]
Former-commit-id: 40917b6118
Former-commit-id: a464a6a8d4 [formerly 0f7e216834] [formerly 0aee5e24eab0cab12c41ad64d2f52c7f99e993be [formerly 59ad20bac3]]
Former-commit-id: 5d4edf0dcaa2380e6bf39a71eb3a7400382619b1 [formerly c1fcdcfde2]
Former-commit-id: 5496419cc9
|
2014-09-02 09:23:58 -05:00 |
|
Steve Harris
|
a8dce1da7e
|
Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: 9e79ff1cff [formerly f7e39c9d6f] [formerly 3b6a003884] [formerly 9e79ff1cff [formerly f7e39c9d6f] [formerly 3b6a003884] [formerly e7705c328e [formerly 3b6a003884 [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]]]]
Former-commit-id: e7705c328e
Former-commit-id: 6184a8ef57 [formerly 79c7e0b492] [formerly 5cde04894fc320a0e396dcbcda7917b88bf7faf3 [formerly 92a45c76fb]]
Former-commit-id: d186fe408ae810a2d706db3817a1118abbd73681 [formerly 6279cdb55c]
Former-commit-id: f1c77c42ed
|
2014-09-02 08:12:49 -05:00 |
|
Steve Harris
|
248ece0f93
|
Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2
Former-commit-id: db74ef9c6d [formerly 142f1bff66] [formerly db74dc031e] [formerly db74ef9c6d [formerly 142f1bff66] [formerly db74dc031e] [formerly 425e8243f2 [formerly db74dc031e [formerly 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21]]]]
Former-commit-id: 425e8243f2
Former-commit-id: 527bb46f95 [formerly 5f0e7e3581] [formerly e4867f4026004901057b68452841e0b1dfb767d8 [formerly 6563187041]]
Former-commit-id: fbc4e34e259a9c29bb47e8d0de695403c93929f2 [formerly f72eb20900]
Former-commit-id: 3806bd14eb
|
2014-09-02 08:09:48 -05:00 |
|
Mark Peters
|
ae538ff95a
|
Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473
Former-commit-id: fc72ed828c [formerly 966879b8a1] [formerly e35a7451c6] [formerly fc72ed828c [formerly 966879b8a1] [formerly e35a7451c6] [formerly 045746ec21 [formerly e35a7451c6 [formerly 8099cbe2359334d6718761046a1475fca687af35]]]]
Former-commit-id: 045746ec21
Former-commit-id: b42885a2af [formerly c850f6b6cd] [formerly 9f5aeecba1c51e5935aa53069c6d888c3c64a904 [formerly cc96e1fb1f]]
Former-commit-id: 0b0b06ddbbc00314f09e4d3b441fcbf71cfea7d0 [formerly 264c5afa15]
Former-commit-id: aa58dab103
|
2014-08-29 16:17:22 -05:00 |
|
Ben Steffensmeier
|
558702d535
|
Issue #3543 Fix gl datamapping of data with NaN conversions.
Former-commit-id: 0f79692cd7 [formerly 9c2c00c71e] [formerly 22f93b6905] [formerly 0f79692cd7 [formerly 9c2c00c71e] [formerly 22f93b6905] [formerly 190893e807 [formerly 22f93b6905 [formerly bc12be9bb6e8c7f63550602f51bca3448c21d4c6]]]]
Former-commit-id: 190893e807
Former-commit-id: 87b89383ca [formerly cb95c6ee3a] [formerly 04fff4eb5df11c24613d82008d0394fbb5a28291 [formerly 6f9dca57e8]]
Former-commit-id: 013af04b82aaefd3f096dba9591f50ee5169e021 [formerly 16561bb4c7]
Former-commit-id: 7476405193
|
2014-08-29 15:08:03 -05:00 |
|
Mark Peters
|
d1154bbe63
|
Omaha #3569 Split Volume Browser planes menus into multiple reusable components.
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9
Former-commit-id: b906c8054b [formerly 86b9016338] [formerly 097ce54969] [formerly b906c8054b [formerly 86b9016338] [formerly 097ce54969] [formerly 91f2b365a1 [formerly 097ce54969 [formerly a0864eff6efa679cdc0f58cd408102e32145f22c]]]]
Former-commit-id: 91f2b365a1
Former-commit-id: adae10c2d0 [formerly abd256ab93] [formerly b7fb901b9427a42706a36a3d4c34c6103d17ca1a [formerly 54f9a37e6c]]
Former-commit-id: 7ce1fb859b9af8c7ab75518422673df67174e57b [formerly a3c382c0f7]
Former-commit-id: 9cab14d5b6
|
2014-08-29 15:05:29 -05:00 |
|
Kiran.Shrestha
|
7b8e3b5390
|
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6
Former-commit-id: b4a897c5a7 [formerly 3abf28f856] [formerly a285439c08] [formerly b4a897c5a7 [formerly 3abf28f856] [formerly a285439c08] [formerly d8bd6a9c70 [formerly a285439c08 [formerly 1681bea10870df58b3f2cc0d0a59f21c596e9e95]]]]
Former-commit-id: d8bd6a9c70
Former-commit-id: 8ad4aa78a8 [formerly f278d7edbf] [formerly c3bd761b7a4aa4335ef9629b9656cb7ddd1bdbd2 [formerly 2687526cec]]
Former-commit-id: 31f923783e15681c3e9248f3dec8597494a3ecce [formerly 022a4dc4dc]
Former-commit-id: df635b2a58
|
2014-08-29 13:50:55 -04:00 |
|
Ron Anderson
|
c317ab5eef
|
Omaha #3459 Ensure font is initialized before queryJob runs,
Additional refactoring to someday allow ZoneSelectorResource to use more common code.
Change-Id: I87e4d1a16b6086f4241e67bb1058bb096eb5e062
Former-commit-id: 0bb6076cdc [formerly f3f2ec8843] [formerly 8583386e5f] [formerly 0bb6076cdc [formerly f3f2ec8843] [formerly 8583386e5f] [formerly de490ea582 [formerly 8583386e5f [formerly a1896437f432bcb360365d28a0ee7377cec565af]]]]
Former-commit-id: de490ea582
Former-commit-id: 06dbcd69d6 [formerly ae69665e50] [formerly 39b07ee71f914fcb7284dbe4733a3b9645faf975 [formerly 338672c03f]]
Former-commit-id: e0bb2a385f25bd2eb5b08e0b6f5f02ee58b77b3c [formerly 3954787487]
Former-commit-id: 4a821c89b7
|
2014-08-29 12:04:52 -05:00 |
|
Nate Jensen
|
a14acec7da
|
Merge "Omaha #3561 Yet another attempt to fix combinations file updating" into omaha_14.4.1
Former-commit-id: 1f087e5f0c [formerly 47261a4ac4] [formerly 16191b10ab] [formerly 1f087e5f0c [formerly 47261a4ac4] [formerly 16191b10ab] [formerly c60dfb889c [formerly 16191b10ab [formerly 3482282527df3ffd13c93d1a5d63d52ce79f8b2b]]]]
Former-commit-id: c60dfb889c
Former-commit-id: e994012d79 [formerly 6647ce3111] [formerly d6db0ba4036aa9711953caa0d0cd0c0456216e6e [formerly b61f93a2e4]]
Former-commit-id: bb0004636a214383e71c110406009e82fd42ff09 [formerly 08a9210cce]
Former-commit-id: 5e78fb700b
|
2014-08-29 11:16:16 -05:00 |
|
Steve Harris
|
d6571dcf19
|
Omaha #3132 - removing duplicated com.raytheon.uf.viz.core
Former-commit-id: 12cd8db99b [formerly f51ceee718] [formerly aedf89c00b] [formerly 12cd8db99b [formerly f51ceee718] [formerly aedf89c00b] [formerly c49eabbb45 [formerly aedf89c00b [formerly 94468f09bd626bd2ff26e7312ceede154f427664]]]]
Former-commit-id: c49eabbb45
Former-commit-id: 703098364e [formerly 113bcace66] [formerly a225c040ed3b1662d147a0f61eb11c429834a4a4 [formerly d24b29f7b2]]
Former-commit-id: e88047a01ace8ac3938d2a3d8316418ec4655cc7 [formerly aed5540042]
Former-commit-id: a7e18342d9
|
2014-08-29 11:05:34 -05:00 |
|
Ron Anderson
|
cb4ecaae1f
|
Omaha #3561 Yet another attempt to fix combinations file updating
Change-Id: I4131ed6043e4bbfa2955024b5e3ce4508734585f
Former-commit-id: 30ef2a7667 [formerly 89cde78ea6] [formerly bd52b5a924] [formerly 30ef2a7667 [formerly 89cde78ea6] [formerly bd52b5a924] [formerly 9f37d7914a [formerly bd52b5a924 [formerly b1c067fe33d1fe09f89e981b03ef178bcc3a5f93]]]]
Former-commit-id: 9f37d7914a
Former-commit-id: d7f3e42548 [formerly b58479dc0b] [formerly 6362bc55a2ad3ebcea3f99623c5d126d5e3a486e [formerly b489928744]]
Former-commit-id: 7a0b93268eac3e1d8ed6c872ab795d04b56a0b9d [formerly 7158207736]
Former-commit-id: acc6079444
|
2014-08-29 10:45:54 -05:00 |
|
Steve Harris
|
3c8bfc8160
|
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
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.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]
Former-commit-id: 5d58625abc
Former-commit-id: 10070d2762 [formerly 66b485c000] [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54 [formerly d984dd538f]]
Former-commit-id: ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4 [formerly e681e0a457]
Former-commit-id: ecf26b3ac5
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
a784936b10
|
Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: 31c13bf0bf [formerly a5519a28d9] [formerly 37c926973c] [formerly 31c13bf0bf [formerly a5519a28d9] [formerly 37c926973c] [formerly a2f66c8d97 [formerly 37c926973c [formerly cff9bfd2697a73ccc18642d8dc057b6a27aa2991]]]]
Former-commit-id: a2f66c8d97
Former-commit-id: d805faa88c [formerly d14d2b9a30] [formerly 39e8d8ffde8b1fa357b628c70cca02439f025ba2 [formerly f3eba57747]]
Former-commit-id: d89b641dbae4734fb3a72f403f69b6fe21f7e7ae [formerly 24a0b8457e]
Former-commit-id: 85d763def5
|
2014-08-29 10:07:14 -04:00 |
|
Brian Clements
|
a3fa77d796
|
Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040
Former-commit-id: c0b132d6ee [formerly 981390eb22] [formerly b352bd3944] [formerly c0b132d6ee [formerly 981390eb22] [formerly b352bd3944] [formerly cfeb16eff8 [formerly b352bd3944 [formerly b3482522860408c2d052261e845899cf73c2ce96]]]]
Former-commit-id: cfeb16eff8
Former-commit-id: 3015aef7b9 [formerly c337087043] [formerly da0614500f744bdca9a9cd20f1050898018e3164 [formerly a2010c729a]]
Former-commit-id: 378c8cc0cd2c0288760022a651b07b1c9c74ada1 [formerly 139466b9ef]
Former-commit-id: e9eb97a8fb
|
2014-08-29 08:55:58 -05:00 |
|
Juliya Dynina
|
abb33a7cdd
|
Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
Former-commit-id: d911b87c7e [formerly 5f001b7ad7] [formerly 169dc0ba43] [formerly d911b87c7e [formerly 5f001b7ad7] [formerly 169dc0ba43] [formerly 58a3df78a8 [formerly 169dc0ba43 [formerly bb260c4003b477ca51cf5fd9c8d54275af906772]]]]
Former-commit-id: 58a3df78a8
Former-commit-id: f1332a37cc [formerly 62d2e61a75] [formerly d8e22d556662dfb3ac872fc696a556d59c038540 [formerly 07b6109b5f]]
Former-commit-id: 6ab8833ed6da018338872e3739e186b679f1bcf8 [formerly 9a5eb28213]
Former-commit-id: 95f1799dc6
|
2014-08-28 15:52:11 -05:00 |
|
Nate Jensen
|
be47d6a454
|
Merge "Omaha #3356 inject spatial query through spring" into omaha_14.4.1
Former-commit-id: dc6e307895 [formerly 8f0bd2bb84] [formerly 67d5cb52ae] [formerly dc6e307895 [formerly 8f0bd2bb84] [formerly 67d5cb52ae] [formerly 822f1a20b0 [formerly 67d5cb52ae [formerly afd5131062926a78942db59f35a5c2e719a542da]]]]
Former-commit-id: 822f1a20b0
Former-commit-id: 5d22759e9d [formerly 975f93d6cf] [formerly 0cf3789fe064185f8bdfb1456506f24980b4e4f4 [formerly 0a8312b09d]]
Former-commit-id: 988fbe5f0aef36ed0052fad8077ea02e6a7ba815 [formerly 1aa74a38d8]
Former-commit-id: 7e2f184332
|
2014-08-28 14:32:57 -05:00 |
|
Ana Rivera
|
e57246c6ce
|
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: b03dd41331 [formerly e033ed5546] [formerly 160dabc4d1] [formerly b03dd41331 [formerly e033ed5546] [formerly 160dabc4d1] [formerly 9af77831a6 [formerly 160dabc4d1 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]]]
Former-commit-id: 9af77831a6
Former-commit-id: ae4ea166aa [formerly 2045699212] [formerly 55222fba76e6458ccc65b959b86f2e7bff061cbc [formerly fbe4d57f6b]]
Former-commit-id: f1c71d002deedd0c02aa5622f474ac29e9b2dd09 [formerly dee335f370]
Former-commit-id: aec8eba1a7
|
2014-08-28 18:38:26 +00:00 |
|
Roger Ferrel
|
9322cc494f
|
Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec
Former-commit-id: 60d6b770aa [formerly 15c73be56c] [formerly 6f8c6d6aa1] [formerly 60d6b770aa [formerly 15c73be56c] [formerly 6f8c6d6aa1] [formerly ef5dfb1f93 [formerly 6f8c6d6aa1 [formerly bcc9b0a6352151dfdf3ba75063bb87308cb162b4]]]]
Former-commit-id: ef5dfb1f93
Former-commit-id: 6fcac050be [formerly ffa95bce90] [formerly a75847a14ce68662ce3ae2487c06dcc0a6e1e748 [formerly fe50853adb]]
Former-commit-id: 8abe9b8b145e7dc278af60c6258a58d392c001a0 [formerly 86d4730538]
Former-commit-id: 89f66db462
|
2014-08-28 13:10:11 -05:00 |
|
David Friedman
|
3dbc4239e9
|
ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa
Former-commit-id: 16c903e2c5 [formerly 9c2545ed64] [formerly de6e79f9e3] [formerly 16c903e2c5 [formerly 9c2545ed64] [formerly de6e79f9e3] [formerly d5c086a022 [formerly de6e79f9e3 [formerly aca832a81bc18d954eadb51755ce04597cd264df]]]]
Former-commit-id: d5c086a022
Former-commit-id: 182df433a9 [formerly b2cc41f3de] [formerly a179ad829ac12e1773af11cae397893e6b1617b6 [formerly 6209bbc36f]]
Former-commit-id: 73ae135681bf633630b5cc3958129e68b1071732 [formerly 41b4886743]
Former-commit-id: e42ffa0ad4
|
2014-08-28 18:08:23 +00:00 |
|
Daniel.Huffman
|
6aa67f4588
|
ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e
Former-commit-id: 39f7795b7c [formerly c3731d5622] [formerly c89a7169b0] [formerly 39f7795b7c [formerly c3731d5622] [formerly c89a7169b0] [formerly ca2aa8811b [formerly c89a7169b0 [formerly 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f]]]]
Former-commit-id: ca2aa8811b
Former-commit-id: eab387d780 [formerly eb9b743c46] [formerly 4e8f9df5152a35ae2d89acc7ab6ad942931f615c [formerly dc2bc16bcc]]
Former-commit-id: 228c90a329fdf4dbbc995cb3df98fa83f3fcfc66 [formerly b97ea429c3]
Former-commit-id: ff850b4cf0
|
2014-08-28 17:20:30 +00:00 |
|
Nate Jensen
|
f6b45f075d
|
Omaha #3356 inject spatial query through spring
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d
Former-commit-id: c383a50c2c [formerly baece22d79] [formerly 58c85c76ef] [formerly c383a50c2c [formerly baece22d79] [formerly 58c85c76ef] [formerly 8f226399f7 [formerly 58c85c76ef [formerly 0b7ea786593f963ad1464c3426bcec7ac59914ae]]]]
Former-commit-id: 8f226399f7
Former-commit-id: fcc794c395 [formerly 244395af69] [formerly 8fb5e2190df56d7947f5fa01937f377db2b2b918 [formerly 9843865254]]
Former-commit-id: 1078ebed9c14b2f160ab76ef1d6cb10d34c627c0 [formerly 2b829dc66b]
Former-commit-id: fe0cd768ad
|
2014-08-28 11:46:25 -05:00 |
|
Nate Jensen
|
4f7f573aee
|
Merge "Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily" into omaha_14.4.1
Former-commit-id: 637dbddd2f [formerly 9fe0e6df69] [formerly 625f0db18f] [formerly 637dbddd2f [formerly 9fe0e6df69] [formerly 625f0db18f] [formerly 0ee832fc2f [formerly 625f0db18f [formerly 0a6287431cbcc43ad6f42898a94d173fe451566e]]]]
Former-commit-id: 0ee832fc2f
Former-commit-id: 37b7936b7c [formerly 2a7cd5957d] [formerly d2c0d3d4439d68fab0f781b1b347ece53b4e57ad [formerly ce138b3e31]]
Former-commit-id: 76b6da7d01c1d7b06ed1902c25101c4523e98f84 [formerly 0e0cf3ba67]
Former-commit-id: 91ae999120
|
2014-08-28 11:30:45 -05:00 |
|
Nate Jensen
|
39407bd9e4
|
Merge "Omaha #3562 jetty upgrade change for dataserver" into omaha_14.4.1
Former-commit-id: 579881a4fe [formerly 22f24dbb13] [formerly c8c93dccf1] [formerly 579881a4fe [formerly 22f24dbb13] [formerly c8c93dccf1] [formerly e0d861461b [formerly c8c93dccf1 [formerly 96882cbdc801c37e63ca0bc1ce950cbdffd97122]]]]
Former-commit-id: e0d861461b
Former-commit-id: 4e49b2032e [formerly 16ee6e44a2] [formerly b2f37db95cc07754df8630ea19a398267bdd4e32 [formerly 1d3c307bd8]]
Former-commit-id: 9ee7ac2050f6b82493350fbedab2db1f6fd214ff [formerly 419437c6bd]
Former-commit-id: 5b03e9fa4a
|
2014-08-28 11:23:43 -05:00 |
|
steve.naples
|
33e95d1e49
|
ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138
Former-commit-id: bf9924b0e9 [formerly 4205d83452] [formerly 1856a05319] [formerly bf9924b0e9 [formerly 4205d83452] [formerly 1856a05319] [formerly ff52f1dc0a [formerly 1856a05319 [formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]]]]
Former-commit-id: ff52f1dc0a
Former-commit-id: 899ff32548 [formerly 1532c683a1] [formerly 2916716519dd7ee38032637d8a99f6fb81e1e7ba [formerly 211e9f7546]]
Former-commit-id: cc4eaa9f2dd1e8e914858e1e4828f637b78454d8 [formerly 3f11e82772]
Former-commit-id: 03f50a48f1
|
2014-08-28 16:08:17 +00:00 |
|
Ron Anderson
|
7cc1ad7088
|
Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34
Former-commit-id: 1e05b981fa [formerly dc185b8dd1] [formerly bb1e80b844] [formerly 1e05b981fa [formerly dc185b8dd1] [formerly bb1e80b844] [formerly 2b88ade974 [formerly bb1e80b844 [formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]]]]
Former-commit-id: 2b88ade974
Former-commit-id: c6eb33afcc [formerly 39d00a72ce] [formerly 36188db03ab5afd51b2833d61639eaa10519a6f7 [formerly 0962c75d18]]
Former-commit-id: 86f00e159c29c3c94d7aa9fffb6a0183327a64c0 [formerly 56b56ea4f3]
Former-commit-id: 932d9e2783
|
2014-08-28 10:43:54 -05:00 |
|