Commit graph

2510 commits

Author SHA1 Message Date
Richard Peter
989ac3147f Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
Former-commit-id: d4c67a0f8c [formerly 6236137635] [formerly 390e73af44] [formerly d4c67a0f8c [formerly 6236137635] [formerly 390e73af44] [formerly 897980da08 [formerly 390e73af44 [formerly 5fee1c62ae87e59007b57ba74268b5f272648127]]]]
Former-commit-id: 897980da08
Former-commit-id: 5dd2d089bb [formerly a910870531] [formerly d757b784318130cb248a48533db6e16ad9554e32 [formerly 780b504251]]
Former-commit-id: 1d59c583c016450694956f5445ba6500a32927d7 [formerly 9060aab6dd]
Former-commit-id: 631aa74a10
2014-03-24 09:53:13 -05:00
Dave Hladky
a6d07e82a6 Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2

Former-commit-id: 912c7e2d12 [formerly 39343e1801] [formerly 3ac04dd071] [formerly 912c7e2d12 [formerly 39343e1801] [formerly 3ac04dd071] [formerly 9f3c5dcc42 [formerly 3ac04dd071 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]]]
Former-commit-id: 9f3c5dcc42
Former-commit-id: c978694653 [formerly e464a1d8f8] [formerly 52a66b8f177ba3fcebbd8fee9b4e8b300ae9ba10 [formerly 43cbcff538]]
Former-commit-id: a34ec85b7be5311fc6e20f3d93ca82b2276e2023 [formerly 3d61ca32f6]
Former-commit-id: a37f87968c
2014-03-24 08:27:12 -05:00
Mike Duff
b1e31e388d Issue #2941 - Sort data before returning
Former-commit-id: d7d06e18fd [formerly ff07b90659] [formerly 73a011b940] [formerly d7d06e18fd [formerly ff07b90659] [formerly 73a011b940] [formerly 4db73e42a5 [formerly 73a011b940 [formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]]]]
Former-commit-id: 4db73e42a5
Former-commit-id: b26be09c49 [formerly 8d1347d1f7] [formerly c59574ba2d086ee6c90dd15718f0f7b5869fb8e2 [formerly 43eccead7c]]
Former-commit-id: cb740913b5439b8346144311c9578671ffd048c4 [formerly 8f00b37688]
Former-commit-id: 05fbcc61ca
2014-03-24 08:19:21 -05:00
Brian.Dyke
91da395a71 Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 674036b172 [formerly 50e5f4f78d] [formerly 06ee9a6384] [formerly 674036b172 [formerly 50e5f4f78d] [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 06ee9a6384 [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: 402035e7f9 [formerly d97b88f433] [formerly 1a63c19999c01830d72a5d605c2cc1247fc3b4eb [formerly 14567f20a7]]
Former-commit-id: 2c253da743c15a00910b72d8aac49c5cbb6f5609 [formerly f540c6fb2d]
Former-commit-id: aea0544eec
2014-03-24 07:01:29 -04:00
Slav Korolev
531dafbe7d Issue #2652. Fixed issue with edex-text-ingest log. Corrected.
Change-Id: I0064146b6b6d1c05955f513ab9eda9b6ba03de76

Former-commit-id: 0fc3c30f61 [formerly c730d58f6c] [formerly 4786aa382b] [formerly 0fc3c30f61 [formerly c730d58f6c] [formerly 4786aa382b] [formerly 88fbcc2ca6 [formerly 4786aa382b [formerly dd0660d1b51aef2e3e703fd21c0f1d98f3484fbc]]]]
Former-commit-id: 88fbcc2ca6
Former-commit-id: db8fdc4212 [formerly 84d8d13da7] [formerly 2cde309c31fba804ae73c7c2ead1657f5e912896 [formerly c6f98da81c]]
Former-commit-id: 2989e26b9c8a2180401c22bdaf270838a6ca639a [formerly 49bd53ef7c]
Former-commit-id: 54e1c39279
2014-03-21 15:25:51 -04:00
Brian.Dyke
1f96787564 OB_14.1.1-24 baseline
Former-commit-id: 8366e88db1 [formerly 37e9d48d45] [formerly 37b6368268] [formerly 8366e88db1 [formerly 37e9d48d45] [formerly 37b6368268] [formerly face1ebeeb [formerly 37b6368268 [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]]
Former-commit-id: face1ebeeb
Former-commit-id: 49f7c81de1 [formerly cfa058a345] [formerly 96a438276ab6f5a4af7ac304e214e79258c0ea3d [formerly 6b2175da93]]
Former-commit-id: bd70e5cfe36861d8349138232ac519963886caa3 [formerly 2fda566cfb]
Former-commit-id: 7aeb9af309
2014-03-21 12:43:50 -04:00
Richard Peter
7944e2c35a Merge "Issue #2652. Fixed issue with edex-text-ingest log." into development
Former-commit-id: 92a5aea0ef [formerly fa801ee21e] [formerly e766c3b5bf] [formerly 92a5aea0ef [formerly fa801ee21e] [formerly e766c3b5bf] [formerly b87cb91164 [formerly e766c3b5bf [formerly f3ed4ac03fd902909d027e576245ebb47c4d69b3]]]]
Former-commit-id: b87cb91164
Former-commit-id: 212be015e5 [formerly dae6dcd9fa] [formerly 09666748e8278795b92b4205d5ba76dac457afdb [formerly 1777bc667c]]
Former-commit-id: 42687042ad53c8428dd10cf32900d99c54c44b54 [formerly 8b0b197a79]
Former-commit-id: c3e96872f1
2014-03-21 10:23:08 -05:00
Brad Gonzales
b404e07694 Issue #2873 Removed 32 bit native libraries and references.
Change-Id: I52debdaa954ebb0193f64bdaadf45f26500aa40f

Former-commit-id: 25050d57f6 [formerly de508133ff] [formerly 08dde4824f] [formerly 25050d57f6 [formerly de508133ff] [formerly 08dde4824f] [formerly 189234f162 [formerly 08dde4824f [formerly d0108c2cb27c63c8133a7381b0d2c1bbdb89f1d6]]]]
Former-commit-id: 189234f162
Former-commit-id: 02a20c0e37 [formerly 0022633626] [formerly b1f2574d3b73438b586d2b8edcd4477283696b6d [formerly d303662a51]]
Former-commit-id: 9d6f627b3d954f1806f2ed939de355f3fe6bafcb [formerly f859a625d0]
Former-commit-id: 412262edcf
2014-03-20 13:27:39 -05:00
Nate Jensen
39005b7794 Merge "Issue #2905 added ucar bufr parser" into development
Former-commit-id: 37b8496ba6 [formerly 24acffb941] [formerly 68ef66d3c1] [formerly 37b8496ba6 [formerly 24acffb941] [formerly 68ef66d3c1] [formerly 72156362db [formerly 68ef66d3c1 [formerly 3f966aded5f61189bc7e02343219c36063dece5e]]]]
Former-commit-id: 72156362db
Former-commit-id: 8137a9b8a3 [formerly ca07f99f29] [formerly 9a5b0658ca46aa1e7dc0bdefab093b8730a1918f [formerly fcf4a7e142]]
Former-commit-id: 4b6cd552d95f08f13ea9b3425d35d27b2b6bf51b [formerly dcf91e0b4a]
Former-commit-id: 51eda792e5
2014-03-20 12:28:26 -05:00
Mike Duff
c0f8497363 Issue #2857 - Implement Redbook NCO NDM menus
Change-Id: I93e9f21e8b7e797affe1e52c7baef0217433460b

Former-commit-id: e03e5c8f45 [formerly 645e16792e] [formerly c67f9c4be2] [formerly e03e5c8f45 [formerly 645e16792e] [formerly c67f9c4be2] [formerly 4ec18a8178 [formerly c67f9c4be2 [formerly 2ddd856c9297a782340dc0fb9db2a9d36048f760]]]]
Former-commit-id: 4ec18a8178
Former-commit-id: 8964d6a60d [formerly 80855b8e08] [formerly e63dd7b97cdada1bb29c5901f8eaaa015a51d9ee [formerly a624cd8053]]
Former-commit-id: 9f88b8c3fbc34b95661157c5c211ca13bad31db5 [formerly bb07313742]
Former-commit-id: ab451ac799
2014-03-20 11:24:48 -05:00
Mike Duff
fc7b7be21e Issue #2856 - Implement Redbook CPC ndm menus
Change-Id: I1ef4007b9f7147a9640754aaf8846028a40d0693

Former-commit-id: 6ad3953d46 [formerly cdee2df27f] [formerly 25c8a0a8aa] [formerly 6ad3953d46 [formerly cdee2df27f] [formerly 25c8a0a8aa] [formerly 40319e5fcf [formerly 25c8a0a8aa [formerly 8d9935cbee365c4a8537da610c2aff4d95c50f40]]]]
Former-commit-id: 40319e5fcf
Former-commit-id: e5cb254e1f [formerly af9f9ba2c8] [formerly 31a71f35a6008ebcda10116a7d783af50488d1a0 [formerly 09be0ef28d]]
Former-commit-id: 37e8bd089fdefb30fe5b84d51c3556a1bccab1d1 [formerly 9335ae821e]
Former-commit-id: df31189a39
2014-03-20 11:16:35 -05:00
Brian Clements
de70728f68 Issue #2905 added ucar bufr parser
added netcdf 4.2 bufr library to ucar.nc2 foss
added backported 4.3 bufr splitter library
created a parser wrapper for ease of use


Former-commit-id: 46513ea27c [formerly 5b69e9b21c] [formerly 199701def9] [formerly 46513ea27c [formerly 5b69e9b21c] [formerly 199701def9] [formerly 5348f0a29d [formerly 199701def9 [formerly 5ddf9be7105dbd8d1fb76ce28a4e6e3f03240974]]]]
Former-commit-id: 5348f0a29d
Former-commit-id: 6825bac664 [formerly 420b48c8ea] [formerly a6b2df11d2b1e116738bfd3b8c4f5f2d90e354d4 [formerly 0e11ca3cfe]]
Former-commit-id: 691021e7718ee50a16e8b6be21a574fab364502d [formerly c203e2d631]
Former-commit-id: f673684948
2014-03-20 11:11:53 -05:00
Richard Peter
ecdde8205c Merge "Issue #2859 - Implement redbook MPC NDM menus" into development
Former-commit-id: 3e666a910f [formerly 734eeedd36] [formerly 7070313c0b] [formerly 3e666a910f [formerly 734eeedd36] [formerly 7070313c0b] [formerly 14bed8a1df [formerly 7070313c0b [formerly dc3a698f046599a19beed986c2424c1b8796927e]]]]
Former-commit-id: 14bed8a1df
Former-commit-id: c06e4a93a5 [formerly 1eaad7ed7e] [formerly aa66bb489ae20b85168151545cdaabaabbf4bbfd [formerly 2ea76b73cf]]
Former-commit-id: ced772a09bd4af8489d8d45b1cda06a00967880b [formerly 0668437eba]
Former-commit-id: 694ad6dd4d
2014-03-20 11:01:08 -05:00
Lee Venable
1794d1ad04 Merge "Issue #2929 - the pure Python Override now recognizes REGION as a valid localization level" into development
Former-commit-id: 570ef5f109 [formerly fae5d96361] [formerly 65335c255d] [formerly 570ef5f109 [formerly fae5d96361] [formerly 65335c255d] [formerly 47f5ec5139 [formerly 65335c255d [formerly a5ba903c1500f5e989d9ab6aa80f2521d0653a42]]]]
Former-commit-id: 47f5ec5139
Former-commit-id: 5f03228363 [formerly f72aea75af] [formerly 42e05395e13bf5a8b2f70b62a83e1d521b6b325a [formerly 7499124119]]
Former-commit-id: a99b469a7945320488e512c95a577c02b707eecc [formerly 1bd6fe401d]
Former-commit-id: b9b9f57472
2014-03-20 10:38:17 -05:00
David Gillingham
a64a716c15 Issue #2882: Allow null values to be passed back in parameter values for DefaultGeometryData.
Change-Id: I258d247476cf280e107d386b903e9764a492d4f4

Former-commit-id: de6c0c6b23 [formerly e34f698b1d] [formerly d58bb87ee6] [formerly de6c0c6b23 [formerly e34f698b1d] [formerly d58bb87ee6] [formerly 0407f5b2e5 [formerly d58bb87ee6 [formerly 0e583860b64e9ca856152affe70f62d5f866af4f]]]]
Former-commit-id: 0407f5b2e5
Former-commit-id: c74a81e04e [formerly 7d27ef3a2e] [formerly 750f52493ed8bc08fc17a815359567cf02eac10d [formerly 492264e695]]
Former-commit-id: 6bf6d1caf90f502acc8dd66a02ce436d32d78e78 [formerly dec9acd621]
Former-commit-id: e147fe5674
2014-03-19 17:28:03 -05:00
Mike Duff
10d0d4992a Issue #2859 - Implement redbook MPC NDM menus
Change-Id: Ib681435386ea8e4335f5984ddbee2213633cac8e

Former-commit-id: f49bb3b30c [formerly 4be30fdc5b] [formerly 059ac9c52a] [formerly f49bb3b30c [formerly 4be30fdc5b] [formerly 059ac9c52a] [formerly e479bd7055 [formerly 059ac9c52a [formerly 619efadc2230af13707f124534d3caf2fdfaba68]]]]
Former-commit-id: e479bd7055
Former-commit-id: 22a240a919 [formerly 0b94340d7e] [formerly 9530e3b61c98479d8b44cd26d6af7c2592220ee4 [formerly bb07c57f3e]]
Former-commit-id: 5b7d5893723208a47539da1bfb042f9e6721c7bf [formerly c67dacabf5]
Former-commit-id: 580af4bdeb
2014-03-19 14:40:00 -05:00
Bryan Kowal
620f4c17d0 Issue #2929 - the pure Python Override now recognizes REGION as a valid localization level
Amend: use baseline Redmine number

Change-Id: I765c1199e9d8b639e3c87afec41798459f0f92e4

Former-commit-id: e4d263daee [formerly e7c80e9bfd] [formerly 316f9b4747] [formerly e4d263daee [formerly e7c80e9bfd] [formerly 316f9b4747] [formerly 4e320a35a3 [formerly 316f9b4747 [formerly b48eb97e9d270ad49d93f2ca85ceae48da9b9269]]]]
Former-commit-id: 4e320a35a3
Former-commit-id: b1b31ffe43 [formerly e92a5230a3] [formerly 00b3d63df6c842c70fde8d100307033b01a01b1d [formerly 68c1654214]]
Former-commit-id: 6fb95f948116941355d6aeaf661c92bbcc6777ef [formerly f02a9f476a]
Former-commit-id: d189d82929
2014-03-19 14:07:03 -05:00
steve.naples
3c82d305bb ASM #428 Updated SATPRE file header to correct reftime.
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204

Former-commit-id: 20399400cb [formerly 64b19f2e41] [formerly d0f4df4ad9] [formerly 20399400cb [formerly 64b19f2e41] [formerly d0f4df4ad9] [formerly 1aa970164f [formerly d0f4df4ad9 [formerly e51a12ae977528eb85d2c59505ac5be92d945cfe]]]]
Former-commit-id: 1aa970164f
Former-commit-id: 8d9a51770d [formerly 885ceb834b] [formerly 5c8cd26c00210e720cf38e0d3c939e91ef07f9f2 [formerly 9c9ddaba6a]]
Former-commit-id: 1011ac2cb09f5dc6ca3423e02ff585fc80846ef1 [formerly 47e1a3627f]
Former-commit-id: f0b105bbdf
2014-03-19 18:16:41 +00:00
Slav Korolev
07627d98ff Issue #2652. Fixed issue with edex-text-ingest log.
Former-commit-id: 70c7389edd [formerly 68a98f4d85] [formerly ef75ea04c0] [formerly 70c7389edd [formerly 68a98f4d85] [formerly ef75ea04c0] [formerly 7ca9607e68 [formerly ef75ea04c0 [formerly 62f19ca599740c580973e166e8053ba1c4800178]]]]
Former-commit-id: 7ca9607e68
Former-commit-id: 4805d1b502 [formerly cfe67c2528] [formerly 3a9f0ad7e63e0323c856a828486f27c9c0a0ee5a [formerly 423fc045e3]]
Former-commit-id: 02d431d28981b51fe17b33b05d68ed2a7618c812 [formerly 0eb6d0ebde]
Former-commit-id: bcc2a7ecc5
2014-03-19 11:00:51 -04:00
Juliya Dynina
c588ad7d30 Merge "ASM #338 Updated HRAPCoordinates to not parse whitespace" into asm_14.2.2
Former-commit-id: a7d0d73bfb [formerly 34b6972f79] [formerly 9aa170ca5f] [formerly a7d0d73bfb [formerly 34b6972f79] [formerly 9aa170ca5f] [formerly 7a14dfb5a9 [formerly 9aa170ca5f [formerly 8f842b0defba552ebbbe980b42dfb7618a2a7ccd]]]]
Former-commit-id: 7a14dfb5a9
Former-commit-id: 32997f7a35 [formerly f4c1f51b2c] [formerly e26d0c0ec46bd618d59506f7d808f031aee442d2 [formerly e939d718e5]]
Former-commit-id: 59261315661eb88d9a2275bdd814fbcfd26eb8ba [formerly b5c93d06e6]
Former-commit-id: 668c24997d
2014-03-18 13:52:48 -05:00
Nate Jensen
609843c955 Merge "Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common. Peer review comments" into development
Former-commit-id: 350786f305 [formerly 61c5a25407] [formerly 85e3ac041a] [formerly 350786f305 [formerly 61c5a25407] [formerly 85e3ac041a] [formerly 7e7745cd7b [formerly 85e3ac041a [formerly 5e03b83061e1cd7f1a15e939c2bc98d3b99cf393]]]]
Former-commit-id: 7e7745cd7b
Former-commit-id: a1a8f1301d [formerly e3bc322d49] [formerly 7e6b7e93a2aaaab43dd435634d25d8d512cd812b [formerly 3e32812f13]]
Former-commit-id: f1fdbeb2127cd49d5c53a3b7d78123fcbf952e1d [formerly f823e46676]
Former-commit-id: e25dd853df
2014-03-18 13:13:53 -05:00
Mike Duff
f696d21d79 Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common.
Peer review comments

Change-Id: Ie27e8f93d976dcc0573631472986898b3ad8c9ef

Former-commit-id: d757b01edd [formerly 26866f4d73] [formerly 105a11d8f9] [formerly d757b01edd [formerly 26866f4d73] [formerly 105a11d8f9] [formerly cb6a3e2cf5 [formerly 105a11d8f9 [formerly 29a88687a788305be537ef97cce13e3f45338205]]]]
Former-commit-id: cb6a3e2cf5
Former-commit-id: 66d25b52b6 [formerly ae979e09f5] [formerly ccb7af23738b661ca7c7082b674c4f1d8292999e [formerly d98f4b2ab0]]
Former-commit-id: d81f9a460947b85ffa0942facc186cfe7fbf0e10 [formerly ef7847bc14]
Former-commit-id: 397af6e36e
2014-03-18 11:32:28 -05:00
steve.naples
891325ca18 ASM #338 Updated HRAPCoordinates to not parse whitespace
Change-Id: I353e8a07927f3e36aa8905506f63b0e50f2179a6

Former-commit-id: e9e171be78 [formerly 46675eec43] [formerly 309ff4e7f7] [formerly e9e171be78 [formerly 46675eec43] [formerly 309ff4e7f7] [formerly 75e8a907fe [formerly 309ff4e7f7 [formerly 220ef7b1195366834c9f85b828862f128dd3fea1]]]]
Former-commit-id: 75e8a907fe
Former-commit-id: 2e7668a201 [formerly 2ff30dac48] [formerly ca9ed947fcb58c1cba6a54ae689f4ca7ac1fadc6 [formerly 54cc3397ee]]
Former-commit-id: dc2cff8e9f7209d5a18c8a575b066886ec16ee3a [formerly 72d6b1f1a5]
Former-commit-id: 2d22f976f4
2014-03-18 15:40:13 +00:00
Nate Jensen
21be9a3d42 Merge "Issue #2904 Nullpointer potential in MesoTabular product." into development
Former-commit-id: 68b9ca0d49 [formerly 8b83cd83bf] [formerly a09714792e] [formerly 68b9ca0d49 [formerly 8b83cd83bf] [formerly a09714792e] [formerly 5b948e7214 [formerly a09714792e [formerly 196894dd57fa63f4a6a9dea97fb5fa9f09750a5f]]]]
Former-commit-id: 5b948e7214
Former-commit-id: cc6dd8cb62 [formerly e430428a23] [formerly 0740873c1cd8906c8433ccfabe80a93c17b53722 [formerly 23d3d331a3]]
Former-commit-id: 80370771725d6609d4fecfb0e77b576427af4645 [formerly c36d0be4de]
Former-commit-id: d0b0b32120
2014-03-18 09:14:17 -05:00
Juliya Dynina
09610757c8 Merge "ASM #330 - Fix reloading of TextDB static files" into asm_14.2.2
Former-commit-id: 83e355b778 [formerly 30545f79c5] [formerly 85fd3b3888] [formerly 83e355b778 [formerly 30545f79c5] [formerly 85fd3b3888] [formerly ef873880b6 [formerly 85fd3b3888 [formerly 0d338537015e8e8a98fa67bc658fa3a4ed0f15f0]]]]
Former-commit-id: ef873880b6
Former-commit-id: 1973f957f9 [formerly bd6ae766c2] [formerly 1a8bc7b0588d89b907431859c6cd96619f6b85f4 [formerly 67f8f79e9f]]
Former-commit-id: 74172528c406eb260ab44cda0a1ae2efcea9022d [formerly cc3e0b3360]
Former-commit-id: 5505320aa3
2014-03-18 08:47:22 -05:00
Juliya Dynina
9296d1aba2 Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2
Former-commit-id: 0691c153f7 [formerly d6e2b7f741] [formerly c735051e00] [formerly 0691c153f7 [formerly d6e2b7f741] [formerly c735051e00] [formerly 867f00b438 [formerly c735051e00 [formerly 669d66d3b8279833df4a361c961c113e653a542d]]]]
Former-commit-id: 867f00b438
Former-commit-id: 5f3c6c617e [formerly ed07060240] [formerly f3ff22bda2c35c61c7a757023a9acddcadcbc749 [formerly c54631024a]]
Former-commit-id: b7d2487394f68eb266f5d106c9eb4af2160dd92b [formerly d34b5c1a2c]
Former-commit-id: de68dcfeb4
2014-03-18 08:13:51 -05:00
David Friedman
5aafddf3de ASM #330 - Fix reloading of TextDB static files
Change-Id: I23c6f2883c5ce645854283996fd391f805b2b4f5

Former-commit-id: 4492bf353d [formerly fd203b5999] [formerly 15ca9f4dcc] [formerly 4492bf353d [formerly fd203b5999] [formerly 15ca9f4dcc] [formerly decdadce01 [formerly 15ca9f4dcc [formerly 0a94094f0f140de68da634cbc6c79039507712ca]]]]
Former-commit-id: decdadce01
Former-commit-id: 07828421c2 [formerly f19895db07] [formerly 47dd084f53fe1100ab28828ac109cf98015fb0a1 [formerly 9beaf9be16]]
Former-commit-id: 2822ae604c3dfc8fafbbe0b95b440c6bcfa04a19 [formerly 5fe3990a9e]
Former-commit-id: cf85796def
2014-03-18 13:12:40 +00:00
Qinglu.Lin
b0cf607329 ASM #335 - Watch wording not being inserted for SMW and SMW followup
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05

Former-commit-id: a62e75e8b5 [formerly 09e90dfe43] [formerly 4b3c821ce0] [formerly a62e75e8b5 [formerly 09e90dfe43] [formerly 4b3c821ce0] [formerly af82143e84 [formerly 4b3c821ce0 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]]]]
Former-commit-id: af82143e84
Former-commit-id: 2b4ab71782 [formerly 1b352b8600] [formerly a5da7a6ab2edf30dc691e926f832381fb33cc183 [formerly bd7d68bd16]]
Former-commit-id: 8b795eb68de0b31c9a7c09c0052c419f92830442 [formerly 72b8b32e25]
Former-commit-id: 119fc9840e
2014-03-17 18:17:49 -04:00
Steve Harris
24c55c616c Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 016a659753 [formerly 5d95d594f8] [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb [formerly b5a2d2237f]]
Former-commit-id: fde598cdbbe0d12d61ab87081d43c79970894959 [formerly 3a82fa7ac6]
Former-commit-id: a936941dff
2014-03-17 15:55:41 -05:00
Dave Hladky
1fdd0343e0 Issue #2904 Nullpointer potential in MesoTabular product.
Former-commit-id: 515d58dec7 [formerly b43bd1f861] [formerly 73d8618833] [formerly 515d58dec7 [formerly b43bd1f861] [formerly 73d8618833] [formerly 373f052de8 [formerly 73d8618833 [formerly e3139396104ee0d4ffc1dea7fd20782d00eb5ade]]]]
Former-commit-id: 373f052de8
Former-commit-id: c3cafc3e4e [formerly 2b841c55f6] [formerly b9db6e2f2b11d52e63d964ebd1d02a19300d2170 [formerly 4c2bbde8f1]]
Former-commit-id: e82697c46fba06637360f21b01ccd6fd57447375 [formerly 5a338fc1e4]
Former-commit-id: 51c411c3ed
2014-03-17 15:22:42 -05:00
Nate Jensen
913ded4fd3 Issue #2908 attempt to fix build
Change-Id: I4ebcf46021113154ae290ed2a5cc0c76d6aac480

Former-commit-id: 5f8e5a3331 [formerly b5f3aee368] [formerly 78afc6040c] [formerly 5f8e5a3331 [formerly b5f3aee368] [formerly 78afc6040c] [formerly 9cf43e7de6 [formerly 78afc6040c [formerly 131d45e260ab446e9764d0fcc1f542ef012ff352]]]]
Former-commit-id: 9cf43e7de6
Former-commit-id: c4fe787a80 [formerly cf171e67ed] [formerly fab84c1417570b64126103092b6ab9ac3f6bb28e [formerly d4596770ee]]
Former-commit-id: 489cd6eab30b705e2916e5b32e18fe24b3be513a [formerly c6db5c24b1]
Former-commit-id: 0014f6142f
2014-03-14 14:14:37 -05:00
Brian.Dyke
f95e1ed18b Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly 9c412e444e [formerly d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]]
Former-commit-id: 9c412e444e
Former-commit-id: 39ef07d49f [formerly 57f7e4b084] [formerly 636e94e2d71aeb03e5b65c5b9c64ecd494fad03f [formerly 88efccf309]]
Former-commit-id: b74e99a753d5ddafa0c2b9e7a7ee76f3251376c4 [formerly 35427557c4]
Former-commit-id: 5fb2fe9266
2014-03-14 11:13:30 -04:00
Ron Anderson
b75886fac4 Issue #2824 Fix possible null pointer when site is deactivated and active table sharing was not enabled.
Change-Id: I2e741e603ade6bbb69ca103006bbcdc213f8acfc

Former-commit-id: aa3418a8ae [formerly dcc068132a] [formerly 883cf26c5f] [formerly aa3418a8ae [formerly dcc068132a] [formerly 883cf26c5f] [formerly 6e6570fd5a [formerly 883cf26c5f [formerly efc59e6541342bfc3e826934e4a9a5d85dc2801b]]]]
Former-commit-id: 6e6570fd5a
Former-commit-id: 1022d5ef82 [formerly 13401793be] [formerly 1c0a3c2990525dbcd7f8e3618855a0958a2768d7 [formerly f93a657fb4]]
Former-commit-id: 10d95ec6d39f96b94beeac3b0d2b691fdda7e756 [formerly 2c8f0c7949]
Former-commit-id: 4ff78789c9
2014-03-14 10:11:00 -05:00
Brian.Dyke
b6b38c0121 Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: a68bda6858 [formerly 4e3096631d] [formerly d4b6d22ae2] [formerly a68bda6858 [formerly 4e3096631d] [formerly d4b6d22ae2] [formerly f999e48df0 [formerly d4b6d22ae2 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]]
Former-commit-id: f999e48df0
Former-commit-id: 86ec9a50d4 [formerly 82756e3855] [formerly 2bdb02ad2c8ccb7c77ded0fd2df41688dea93867 [formerly 3ab2df3507]]
Former-commit-id: 1bf9fe1b47eeea3a212497f6320423ebad1117f1 [formerly 76271269c5]
Former-commit-id: 516ba8e81a
2014-03-14 08:44:39 -04:00
Brian.Dyke
f417ded1bb OB_14.1.1-23 baseline
Former-commit-id: b24e7a66d8 [formerly 55918ee421] [formerly dcc2e4fd61] [formerly b24e7a66d8 [formerly 55918ee421] [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly dcc2e4fd61 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]]]
Former-commit-id: bc6a7bf946
Former-commit-id: 6c021d0eec [formerly e78e030b7c] [formerly ea51c2c24eabbc975758d2dfad3f260a10c7718d [formerly 8f72db144b]]
Former-commit-id: 15a710f2de86297f2fae98fe2c109c5d01b1953d [formerly c7fbd5dfe4]
Former-commit-id: be8f052cff
2014-03-14 08:18:16 -04:00
Nate Jensen
3912038146 Merge "Issue #2718 Fix org.geotools version in common.base.feature/feature.xml" into development
Former-commit-id: 06fa63341d [formerly 727457dd9d] [formerly 620d9cf832] [formerly 06fa63341d [formerly 727457dd9d] [formerly 620d9cf832] [formerly 42649882fa [formerly 620d9cf832 [formerly 63bab83be86d4ad70569187e7948c230819f8b7d]]]]
Former-commit-id: 42649882fa
Former-commit-id: cdcdd6beec [formerly 26607b92a0] [formerly 4c6c27343a5db435fe0f7bc41bc3b6add420bab9 [formerly 38752f1e3c]]
Former-commit-id: b9b6d37b155ab9bce00cd973990aeca33bfcca14 [formerly 17beadd927]
Former-commit-id: a1f39157e3
2014-03-13 12:58:10 -05:00
Ron Anderson
d552e2751d Issue #2718 Fix org.geotools version in common.base.feature/feature.xml
Change-Id: I2e435e5cc7e3a65c116b3ca3ba3bd4f6c736082d

Former-commit-id: 5bd859c9d3 [formerly 6061100cb0] [formerly fc7a19bdf6] [formerly 5bd859c9d3 [formerly 6061100cb0] [formerly fc7a19bdf6] [formerly dcb7b9c88f [formerly fc7a19bdf6 [formerly 98ca1d990e02bd70dacca7c951bf0212f93bdccc]]]]
Former-commit-id: dcb7b9c88f
Former-commit-id: 2393c9dc47 [formerly 9f93a09c9f] [formerly 018515cf4cd2bfdd7cac8cc5f16c530773dc4cdc [formerly c2cadc6f93]]
Former-commit-id: c0cbe61c229f100a7728be09f5f2403675b668fe [formerly 4dfd1495f0]
Former-commit-id: 62eac84e82
2014-03-13 12:54:44 -05:00
Nate Jensen
737feb1c33 Merge "Issue #2909 Remove useLegacyMergeSort java parameter" into development
Former-commit-id: 57ba744427 [formerly 57faf2b7b1] [formerly a2a46becc8] [formerly 57ba744427 [formerly 57faf2b7b1] [formerly a2a46becc8] [formerly befff7be3a [formerly a2a46becc8 [formerly a221c18b0195cb5b8dd284c4f3ef1266a8efd999]]]]
Former-commit-id: befff7be3a
Former-commit-id: 127d260e38 [formerly 071ae3b61f] [formerly 1e5e1d618095429d94f96d6e10274a9f50958b2f [formerly 3f2ff13d14]]
Former-commit-id: 0cf9da3fe58dc2adcdc06bc826e061275824bb89 [formerly a47e73f056]
Former-commit-id: 677ae81c6a
2014-03-13 12:41:14 -05:00
Nate Jensen
288848e15b Issue #2907 split edex.redbook plugin into common and edex redbook plugins
Change-Id: If9f56b7891276410d54880387701cf6ff6291ffe

Former-commit-id: 0597c51f2e [formerly 692ec623b2] [formerly 087307a781] [formerly 0597c51f2e [formerly 692ec623b2] [formerly 087307a781] [formerly cc1cb28eed [formerly 087307a781 [formerly 62923fbae80131fab6256923bc32bc46e46940ba]]]]
Former-commit-id: cc1cb28eed
Former-commit-id: 235d98173d [formerly 027a141c94] [formerly 613b1f0300b324dd34716e78d0468f23f6b5842b [formerly daf6997a59]]
Former-commit-id: 5a7d08b0fbbf547a71e9f7dae7f3514bf2f92cc7 [formerly 1485f7ff48]
Former-commit-id: b1b0f40cdf
2014-03-13 12:23:35 -05:00
Ron Anderson
be71fd9775 Issue #2909 Remove useLegacyMergeSort java parameter
Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a

Former-commit-id: 010666a971 [formerly f921b5c83b] [formerly d1b36c4a72] [formerly 010666a971 [formerly f921b5c83b] [formerly d1b36c4a72] [formerly dd8bfdf941 [formerly d1b36c4a72 [formerly 3aeb50672f8de7b973f234e0ab351416cbf7670b]]]]
Former-commit-id: dd8bfdf941
Former-commit-id: 291504f08d [formerly f24f542137] [formerly 4689925288bb72398ed1efadbc5c3d15c54a177e [formerly b82cf065b5]]
Former-commit-id: 7aa1d3987df5be30748307db9529f5d2a21672a4 [formerly 2bf7b94fe4]
Former-commit-id: 1ed943032d
2014-03-13 11:54:15 -05:00
Nate Jensen
87eaf289e1 Merge "Issue #2718 Update to GeoTools 10.5 Undo reformatting of ncep code Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util" into development
Former-commit-id: a45175cbc9 [formerly a9381c505e] [formerly 540d0f2e1d] [formerly a45175cbc9 [formerly a9381c505e] [formerly 540d0f2e1d] [formerly 27625eb93a [formerly 540d0f2e1d [formerly ee5c599bf4822f73e488e42240c5794189e2d70f]]]]
Former-commit-id: 27625eb93a
Former-commit-id: c2fde2241e [formerly 5f554ade56] [formerly 685d628805abded0ae9728b016ad3cb6833fc05a [formerly d8edb8e91b]]
Former-commit-id: a39642ba88c4d15d783728b3396c1262932e9519 [formerly 432926c40b]
Former-commit-id: b8b63869ed
2014-03-13 11:16:00 -05:00
Ron Anderson
9accd00e1f Issue #2718 Update to GeoTools 10.5
Undo reformatting of ncep code
            Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util

Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a

Former-commit-id: d752e068c7 [formerly ab69d3e318] [formerly 1c727465ee] [formerly d752e068c7 [formerly ab69d3e318] [formerly 1c727465ee] [formerly bcfaf40ebf [formerly 1c727465ee [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]]]
Former-commit-id: bcfaf40ebf
Former-commit-id: cbd408ce4e [formerly 06b0b5b684] [formerly c46a1807b76708c6b5217ba3deb670bd9ca60b66 [formerly 4b2a388628]]
Former-commit-id: cfe7b7159bee965bab52438c7b1f622e5351016b [formerly 4ffc16ce53]
Former-commit-id: 98e22f6e59
2014-03-13 11:11:53 -05:00
Ben Steffensmeier
b6b13cea10 Issue #2528 Fix satellite units/style.
Former-commit-id: eb922ea2e2 [formerly e6cd8b3167] [formerly 77041e5b17] [formerly eb922ea2e2 [formerly e6cd8b3167] [formerly 77041e5b17] [formerly 75120a09cd [formerly 77041e5b17 [formerly 7e38454a31aa55c606c155a108253c0433ecb517]]]]
Former-commit-id: 75120a09cd
Former-commit-id: 82a8490dfc [formerly e2995114dc] [formerly b6272ae932f2784e4677fe602769adb1fef911b2 [formerly d29daf8ede]]
Former-commit-id: 3fdb707afe0c7c8354db1df1089d473246d1649a [formerly fc62e2679d]
Former-commit-id: 1bde438f3a
2014-03-12 14:19:49 -05:00
Richard Peter
1cb0e304b3 Merge "Issue #2858 - Implement NDM menus for ncep/hydro SPC Peer review comments" into development
Former-commit-id: 1e90648b68 [formerly e69e07ce82] [formerly b9ad595f15] [formerly 1e90648b68 [formerly e69e07ce82] [formerly b9ad595f15] [formerly 6cf5eb346a [formerly b9ad595f15 [formerly 50e64a8948daed61e4c9422ef33732a018468e2a]]]]
Former-commit-id: 6cf5eb346a
Former-commit-id: 772c59531e [formerly f762b25e22] [formerly 74dff0c362e75705edbdbc9ed37b4c9420d10df6 [formerly 4b0379de16]]
Former-commit-id: bf8fd6582470249229446cab192ed4ea31e3cf80 [formerly 9a100064d2]
Former-commit-id: 2b4100424b
2014-03-12 11:21:06 -05:00
Mike Duff
720ef476e3 Issue #2858 - Implement NDM menus for ncep/hydro SPC
Peer review comments

Change-Id: Icbafa1e08ea9bc564c3f302715f527b92a5a55e5

Former-commit-id: 972c77589f [formerly 865ef97108] [formerly 9aa0b40ed5] [formerly 972c77589f [formerly 865ef97108] [formerly 9aa0b40ed5] [formerly b434ab5bb3 [formerly 9aa0b40ed5 [formerly a74573fef8cc09ed15341d9873ae1dd2ba561478]]]]
Former-commit-id: b434ab5bb3
Former-commit-id: 530bd2469a [formerly 8c277c76f2] [formerly 8aaab8a34c7dabac5b97f89504144ae51e5ea6d8 [formerly 693793eb92]]
Former-commit-id: fd99bc8ed94fc89d2ea3be073e2d2fd6a962f498 [formerly 7dccf753c4]
Former-commit-id: c1164aae5a
2014-03-12 11:19:18 -05:00
Richard Peter
493e805cbe Merge branch 'omaha_14.2.1' (14.2.1-11) into development
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1

Former-commit-id: 751b37616e [formerly 042468f761] [formerly 7af0cfaf38] [formerly 751b37616e [formerly 042468f761] [formerly 7af0cfaf38] [formerly 7ebbc0cf78 [formerly 7af0cfaf38 [formerly 3f0cf9200a42adb2bd7dbd70e50642e940d6b822]]]]
Former-commit-id: 7ebbc0cf78
Former-commit-id: abf39442ba [formerly f5e1fb569a] [formerly 67499353bc5b2802a0bbc17ca5f119b6ddd6836d [formerly e8ea7b80e6]]
Former-commit-id: cbe3cfa55d05a9b0aaca0d648dd1b36fd4c563be [formerly e2ae7de485]
Former-commit-id: 8b425fed86
2014-03-12 09:47:29 -05:00
Ben Steffensmeier
0fd75e5a66 Issue #2791 Fix fill value filter.
Former-commit-id: bafe8b1bb2 [formerly 538fb61ae0] [formerly 4eb2d74e1c] [formerly bafe8b1bb2 [formerly 538fb61ae0] [formerly 4eb2d74e1c] [formerly 1a45efe2a5 [formerly 4eb2d74e1c [formerly e845b829ba4518ac41f0ac26c22c3d83a5504375]]]]
Former-commit-id: 1a45efe2a5
Former-commit-id: c730a6673e [formerly 6df4977dc2] [formerly e58e298814694eac7d464d26f1709c1c11029359 [formerly c754db3ae3]]
Former-commit-id: d93a6989753654306e7e6fe686fa19aed638f753 [formerly 345ec7fa6a]
Former-commit-id: d63c31cd0a
2014-03-11 17:27:26 -05:00
Richard Peter
64feddc462 Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
Former-commit-id: 4d5c7e49f9 [formerly e981ce3e36] [formerly 18234c5d73] [formerly 4d5c7e49f9 [formerly e981ce3e36] [formerly 18234c5d73] [formerly f59d1433db [formerly 18234c5d73 [formerly 555358125bfb925a2c8ed0d393911b4d045d18b1]]]]
Former-commit-id: f59d1433db
Former-commit-id: 90f3b627af [formerly cc35481b48] [formerly 5f03de8c59b4bb9535d972f40d6cc693c365c3da [formerly 76f15c73dd]]
Former-commit-id: ff2e21df08c5b0602d23df7b135c00450a1c40da [formerly 937c89866d]
Former-commit-id: 318c61b1bf
2014-03-11 16:43:37 -05:00
Dave Hladky
177e76f996 Issue #2678 end retrieval double clutching
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc

Former-commit-id: b440063bb9 [formerly 7cd4304140] [formerly 3500ad262a] [formerly b440063bb9 [formerly 7cd4304140] [formerly 3500ad262a] [formerly 76e216d319 [formerly 3500ad262a [formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]]]]
Former-commit-id: 76e216d319
Former-commit-id: 39cc47bc52 [formerly f3876233e4] [formerly 28b9b16fdbb85a6e9a3afb5298b0813e917a59b1 [formerly 03fd32144a]]
Former-commit-id: 451a7125613fe9ce3c298e07c814874021718d47 [formerly c0d2eb8f6b]
Former-commit-id: 78441a1250
2014-03-11 15:53:59 -05:00
David Gillingham
7c4f0bcee6 Issue #2509: Fix static topo generation break caused by baseline merge.
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68

Former-commit-id: 751d8956a9 [formerly e3a3cf7bad] [formerly b0783b64ce] [formerly 751d8956a9 [formerly e3a3cf7bad] [formerly b0783b64ce] [formerly 187196b519 [formerly b0783b64ce [formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]]]]
Former-commit-id: 187196b519
Former-commit-id: 6fcb5b7e73 [formerly 4179172d0e] [formerly e949b41e8ce1e7c37f0f510cdbbac24e2438f30d [formerly 68edb8d9a1]]
Former-commit-id: db669e661b0dcdd0789172fe8a31d92ad669695d [formerly f30292b471]
Former-commit-id: 0e0fdae804
2014-03-11 11:54:25 -05:00