Commit graph

3554 commits

Author SHA1 Message Date
Ana Rivera
8dcce407dd VLab Issue #5034 - Ingest and Display NWPS model data; fixes #5034
Change-Id: I836ffda083281073f5cf1d20de79f73091d49426

Former-commit-id: 53b96c2b8e [formerly c245f3a3c4] [formerly 53b96c2b8e [formerly c245f3a3c4] [formerly f1f5f2c717 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]]
Former-commit-id: f1f5f2c717
Former-commit-id: 7c67376e2c [formerly c76ed237ac]
Former-commit-id: ab680bc174
2014-10-22 17:03:07 +00:00
Steve Harris
116b83101e Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml

Former-commit-id: e9c9a17f96 [formerly dc557b2d0c] [formerly e9c9a17f96 [formerly dc557b2d0c] [formerly bfade7674d [formerly ea787b645974850607658e5a7dfc4a072d831a3b]]]
Former-commit-id: bfade7674d
Former-commit-id: 879b0608ed [formerly 9e7ce04543]
Former-commit-id: 040e641ec9
2014-10-22 11:45:39 -05:00
Brian.Dyke
9b06c9038c Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 975f877994 [formerly 9bcc6bb52e] [formerly 975f877994 [formerly 9bcc6bb52e] [formerly abb4203634 [formerly c8cd8594507148284ac3ec2283fcc9e152c532a6]]]
Former-commit-id: abb4203634
Former-commit-id: a16d6c944f [formerly 40717fa44c]
Former-commit-id: 06f41040c2
2014-10-22 10:39:36 -04:00
David Lovely
05b6e83a4c Omaha #3721 Changed Grid Data reference to a Soft Reference and reduced memory usage from X*Y to X*3.
Change-Id: I627ded464d411e7f975df088261a975657d41d9a

Former-commit-id: 8a5c1607c9 [formerly 636e823956] [formerly 8a5c1607c9 [formerly 636e823956] [formerly 531b62d114 [formerly 9a6313162a5477863d30ab0a888608ee419067a9]]]
Former-commit-id: 531b62d114
Former-commit-id: d6ba9bdbb7 [formerly 44120d9fba]
Former-commit-id: 2b2a5fcd43
2014-10-21 16:06:18 -05:00
Richard Peter
3a80d5c801 Merge "Omaha #3454 Upgrading to Hibernate 4.2.15" into omaha_14.4.1
Former-commit-id: d2f0ab621f [formerly 05784292b7] [formerly d2f0ab621f [formerly 05784292b7] [formerly 2c21e72bf3 [formerly 6b2879d8180a6b6f60a340977e3254ee5eb95213]]]
Former-commit-id: 2c21e72bf3
Former-commit-id: 168854e078 [formerly 7b9653cdad]
Former-commit-id: b77d5b33aa
2014-10-21 10:51:56 -05:00
Shawn.Hooper
67d5d621ed ASM #13467 - Update GenericHazards.py for Shannon
Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e

Former-commit-id: 700bc0691c [formerly 4d81023184] [formerly 700bc0691c [formerly 4d81023184] [formerly ddeec493c3 [formerly f4e8f7493bbfb025e8040f7663dc582414a87413]]]
Former-commit-id: ddeec493c3
Former-commit-id: 115a9c1fd9 [formerly f1feaee0ea]
Former-commit-id: 2d96f0e149
2014-10-21 11:11:34 -04:00
Nate Jensen
c81c996c4b Merge "Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers." into omaha_14.4.1
Former-commit-id: 1798a75f18 [formerly 24aca9cd99] [formerly 1798a75f18 [formerly 24aca9cd99] [formerly 73c03a3379 [formerly 450faac664f274c1c2ce1bbc0100ecaa984309f7]]]
Former-commit-id: 73c03a3379
Former-commit-id: 1854ad5653 [formerly 1e3b551f4b]
Former-commit-id: cf8e567c18
2014-10-21 08:55:37 -05:00
Nathan Bowler
2565e3f305 Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers.
Change-Id: I18011b95dc7dc2a0d92d41ce6e7864d3aaa1afbf

Former-commit-id: 679c836fdc [formerly d9f75f5adc] [formerly 679c836fdc [formerly d9f75f5adc] [formerly 1ff018ccdf [formerly 8b001934bef0d672bce4739accf994eba497b32c]]]
Former-commit-id: 1ff018ccdf
Former-commit-id: 674b6c2dcc [formerly 23950384ee]
Former-commit-id: 5268e32927
2014-10-21 07:16:18 -04:00
Slav Korolev
8a6f3b4749 Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors.
Former-commit-id: 1f4ed7fd1b [formerly 9c369a9c5c] [formerly 1f4ed7fd1b [formerly 9c369a9c5c] [formerly 8971f40dc2 [formerly 5fb653e5c7f7ffff1daf53487147597a569d7d11]]]
Former-commit-id: 8971f40dc2
Former-commit-id: 19db4c34bb [formerly e517a73d81]
Former-commit-id: de09cba07a
2014-10-20 15:06:05 -04:00
Benjamin Phillippe
008b23be1e Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: e6deeb6fb5 [formerly 7845e8e40f] [formerly e6deeb6fb5 [formerly 7845e8e40f] [formerly fdd16051e8 [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]]
Former-commit-id: fdd16051e8
Former-commit-id: a8ef477042 [formerly 5eec33b078]
Former-commit-id: 3808c125b9
2014-10-20 12:42:19 -05:00
Slav Korolev
be8e3fb6b2 Issue #2757 - Fixed a problem with duplicate zones.
Former-commit-id: bde08f6c38 [formerly 0d4ed62be4] [formerly bde08f6c38 [formerly 0d4ed62be4] [formerly 079b74d69c [formerly 8929c542c33090555dd9db16113453e1000c6e5b]]]
Former-commit-id: 079b74d69c
Former-commit-id: 7df98880af [formerly 7555a3be9d]
Former-commit-id: a3f162adfe
2014-10-20 13:08:44 -04:00
Nate Jensen
3709881113 Merge "Omaha #3720 Remove dataURI from redbook plugin" into omaha_14.4.1
Former-commit-id: dd9f6fb257 [formerly 1245df2e0c] [formerly dd9f6fb257 [formerly 1245df2e0c] [formerly 401390dd9b [formerly 1435184cbc94eb9ee2ac97a5616566c421092805]]]
Former-commit-id: 401390dd9b
Former-commit-id: 168396211b [formerly 54602afa68]
Former-commit-id: 6477939d2d
2014-10-20 11:45:50 -05:00
Dave Hladky
c5924c5c82 Issue #3736 Allow shared subscriptions to have adhocs
Change-Id: I2379ac2cd1f02b36587531b448b8c3e6434664f9

Former-commit-id: 8a4711aa8d [formerly 19840e43f3] [formerly 8a4711aa8d [formerly 19840e43f3] [formerly 5cde2fa48c [formerly a5a2b995e5dd4a7af165f62496d8052ed43d23b4]]]
Former-commit-id: 5cde2fa48c
Former-commit-id: 029a0dd15a [formerly 87ae74320e]
Former-commit-id: b860f286d3
2014-10-20 08:58:08 -05:00
Nate Jensen
d0eeb1113f Merge "Issue #3707 Reworked gridded subscription triggereing for retrievals. Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176" into omaha_14.3.1
Former-commit-id: 68e1e93532 [formerly dcce72b823] [formerly 68e1e93532 [formerly dcce72b823] [formerly cfb24faf68 [formerly 57848f31cc73d81d16595e4e5b01949bcff12a24]]]
Former-commit-id: cfb24faf68
Former-commit-id: 8ab9c456da [formerly 6593a843e4]
Former-commit-id: c73551e8ac
2014-10-20 08:37:41 -05:00
Dave Hladky
16b8183169 Issue #3707 Reworked gridded subscription triggereing for retrievals.
Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176

Former-commit-id: 468276afdd [formerly a3268ae60d] [formerly 468276afdd [formerly a3268ae60d] [formerly c7df290186 [formerly eb64bd232cd25a71dbac655f4d59f9ec10b841b4]]]
Former-commit-id: c7df290186
Former-commit-id: 55c5454bd5 [formerly 54e397a561]
Former-commit-id: 04aa204dc1
2014-10-17 16:01:47 -05:00
Ron Anderson
5f246475bc Merge "Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files." into omaha_14.4.1
Former-commit-id: eae4393aa5 [formerly 82a0b4bb9b] [formerly eae4393aa5 [formerly 82a0b4bb9b] [formerly 1a01842639 [formerly 7a5b27db4a3be6dde7ff701b341124d9ed1a9ecd]]]
Former-commit-id: 1a01842639
Former-commit-id: 37973d264e [formerly e113d88477]
Former-commit-id: ae5402fe97
2014-10-16 18:44:38 -05:00
Ron Anderson
77183528ae Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files.
Former-commit-id: 734ca75957 [formerly 2fbf61748d] [formerly 734ca75957 [formerly 2fbf61748d] [formerly 2781c4369b [formerly 09e39d4f85c8e853475b9f6059a748291e4d1bd7]]]
Former-commit-id: 2781c4369b
Former-commit-id: 2ff4c96038 [formerly aa0749903b]
Former-commit-id: cb5846b2ab
2014-10-16 18:32:04 -05:00
Nate Jensen
e657d347e8 Omaha #3299 fix xml attribute name
Change-Id: I9f0878d9179be0b633e1635eff4d961359a82eb8

Former-commit-id: 306485851f [formerly cd5e4b9a08] [formerly 306485851f [formerly cd5e4b9a08] [formerly 73e15036de [formerly fa064accaafc2a4dedd8574eec6faf1960c8bc70]]]
Former-commit-id: 73e15036de
Former-commit-id: 2b6bd2cb0c [formerly 714d812e17]
Former-commit-id: 1caa1c9b7a
2014-10-16 17:11:26 -05:00
Steve Harris
27d75ed5cf Merge branch 'omaha_14.4.1' into omaha_pda
Conflicts:
	cave/com.raytheon.viz.feature.awips.developer/feature.xml

Former-commit-id: 716c1c8dae [formerly 4535f432ce] [formerly 716c1c8dae [formerly 4535f432ce] [formerly dafec4c8fe [formerly f2c656a4fe6d4b82f691e10d8dc49dcbbcff5adc]]]
Former-commit-id: dafec4c8fe
Former-commit-id: 46d475cc45 [formerly 0a6f1170fe]
Former-commit-id: d42d3aa991
2014-10-16 13:40:43 -05:00
Brian.Dyke
70568c04be Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 498abd3716 [formerly 418894a17b] [formerly 498abd3716 [formerly 418894a17b] [formerly 93df82ac92 [formerly f0f79fb324665245ef759947d24514a6c8bc4470]]]
Former-commit-id: 93df82ac92
Former-commit-id: bde528063d [formerly 8af5c9870e]
Former-commit-id: a71dcd88c4
2014-10-16 12:04:27 -04:00
Shawn.Hooper
a95b84344a ASM #13467 - Fix for GFE: Need to add Beach Hazards Statement
Change-Id: I9d19a76afff8e4c36db20aec15b997eefc260209

Former-commit-id: ee70a6a4bd [formerly eafaf01966] [formerly ee70a6a4bd [formerly eafaf01966] [formerly 118f34bbf1 [formerly 366c7c478c6d83f8d21e3b30cc664a32cabf08bd]]]
Former-commit-id: 118f34bbf1
Former-commit-id: 08ec650f2f [formerly cd6be50dd6]
Former-commit-id: 156edc445f
2014-10-16 11:30:29 -04:00
Brian.Dyke
61ffee9e3a Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 7f719d0124 [formerly c60124fa61] [formerly 7f719d0124 [formerly c60124fa61] [formerly 0d5f2c0add [formerly ea0a81b12c7b1a0154361d97882ef65fc55b20e1]]]
Former-commit-id: 0d5f2c0add
Former-commit-id: a68d796d0f [formerly e44ba36b9b]
Former-commit-id: bcc0a9529f
2014-10-16 11:21:39 -04:00
Nate Jensen
46226566e8 Omaha #3730 export postprocessors package
Change-Id: Ie87558540777c1cea7354b040e386ba67f835311

Former-commit-id: 2fc8887e08 [formerly 5dd168e76a] [formerly 2fc8887e08 [formerly 5dd168e76a] [formerly d5a5d55265 [formerly db613b63005c2763ca94851182042867aedd43c9]]]
Former-commit-id: d5a5d55265
Former-commit-id: 957e4c3b2c [formerly 1f970283b5]
Former-commit-id: 97b2b4c5b5
2014-10-15 14:46:12 -05:00
Sarah Pontius
b8bbccc5d2 VLab Issue #5012 - HLS/TCV files for OPG Oct-15-2014; fixes #5012
Change-Id: Iacf701775c343077102647136272c92d08776caa

Former-commit-id: 776886f5ea [formerly 8be0082cc2] [formerly 776886f5ea [formerly 8be0082cc2] [formerly cdb47ed221 [formerly c7b2c66316ccca08b56fe9ece8f8a24ec260207b]]]
Former-commit-id: cdb47ed221
Former-commit-id: 659752f3a0 [formerly cfadb837bd]
Former-commit-id: 5a11029c45
2014-10-15 10:15:30 -06:00
Steve Harris
3954f6981f Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: 4fde31539e [formerly aff75d954b] [formerly 4fde31539e [formerly aff75d954b] [formerly f2fdf98d2f [formerly 4be51191bc64978e3c455702bede3456666fbffe]]]
Former-commit-id: f2fdf98d2f
Former-commit-id: f3017b859e [formerly da238d6478]
Former-commit-id: 3f6bdf84c5
2014-10-15 08:42:02 -05:00
Mark Peters
1f13d8a2b9 Omaha #3720 Remove dataURI from redbook plugin
Change-Id: Iaeef7a259a51840fa51e1256ed8dc1c5b3df3a49

Former-commit-id: 4a121ecbd5 [formerly 153cf12248] [formerly 4a121ecbd5 [formerly 153cf12248] [formerly 06c9d6f7e9 [formerly 5d3c2eb58fce655b25bf4db2a2045e9007ca58f8]]]
Former-commit-id: 06c9d6f7e9
Former-commit-id: 0cebb38b62 [formerly d67a6327c0]
Former-commit-id: a026684e07
2014-10-14 17:13:23 -05:00
Sarah Pontius
e3348f4ad7 VLab Issue #5001 - HLS/TCV files for OPG Oct-2014; fixes #5001
Change-Id: I4018168e958a75ff7db3dd6cfd88a4ac17947981

Former-commit-id: 3348a672be [formerly 2a96302bfb] [formerly 3348a672be [formerly 2a96302bfb] [formerly 6dee51cb9f [formerly b7ccb5162f481e81dc50fcf63b200ab06a959cb8]]]
Former-commit-id: 6dee51cb9f
Former-commit-id: b63394e7e0 [formerly 28c0e819b7]
Former-commit-id: 95439e2b9d
2014-10-14 12:04:50 -06:00
Mark Peters
76e4a0d7e9 Omaha #3722 Remove dataURI from taf plugin
Change-Id: I214772ee74989ab9f91423c2bad4ee7d58b3eba4

Former-commit-id: d397d917c9 [formerly e7388847d6] [formerly d397d917c9 [formerly e7388847d6] [formerly 708f961708 [formerly 3a0cc08b25395cb168c8344c00fb17fb016aae36]]]
Former-commit-id: 708f961708
Former-commit-id: 64ec038793 [formerly 613423b7d4]
Former-commit-id: 0563436c65
2014-10-14 11:13:03 -05:00
Brian Clements
46845ee755 Omaha #3675 startup shutdown log name includes child pid
fixed capture

Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7

Former-commit-id: 78c2aa3650 [formerly 3a12ab9bdf] [formerly 78c2aa3650 [formerly 3a12ab9bdf] [formerly 6d6d3d26e6 [formerly 84a91d7b11790d4a37abc9b0a5c2d64952321b52]]]
Former-commit-id: 6d6d3d26e6
Former-commit-id: d2042e3485 [formerly 470a695a1a]
Former-commit-id: cf3e570667
2014-10-13 16:32:41 -05:00
Juliya Dynina
012760bad2 Merge "ASM #258 - cross section - switching the log plot to z-coordinate scale" into asm_14.3.1
Former-commit-id: 6beb107913 [formerly 33e30cab01] [formerly 6beb107913 [formerly 33e30cab01] [formerly 32b7e80d82 [formerly 5a639cc5850b906df927db1069bcf60cd68f15ab]]]
Former-commit-id: 32b7e80d82
Former-commit-id: 4e51d7f201 [formerly 0f4094974d]
Former-commit-id: 0aecd81e26
2014-10-10 14:43:13 -05:00
Nathan Bowler
0c28de9d2a Omaha #3595 Register two more fields. Replace UEngine with DAF and properly call the script
Change-Id: I3dac64f0537877858f9cf0bbf9e394e0e56075ba

Former-commit-id: db82cdbdfe [formerly 1df2418409] [formerly db82cdbdfe [formerly 1df2418409] [formerly 33e141dd38 [formerly e1470cb4ce03b49ac85936760469a22786195a99]]]
Former-commit-id: 33e141dd38
Former-commit-id: 0a267a8c22 [formerly 93b2dfc2c9]
Former-commit-id: 815d28aef9
2014-10-10 13:20:04 -04:00
Shawn.Hooper
aad1970cf0 ASM #13467 - GFE: Need to add Beach Hazards Statement
Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6

Former-commit-id: bfa9eb0dea [formerly cea5061c61] [formerly bfa9eb0dea [formerly cea5061c61] [formerly 0c61661989 [formerly 457c467d7437c5550bb8727e813d8aa9d9c338a9]]]
Former-commit-id: 0c61661989
Former-commit-id: 26c4187518 [formerly c2acd70bc5]
Former-commit-id: 7d9fe08ca9
2014-10-10 13:14:25 -04:00
Richard Peter
47def22dd0 Merge "Omaha #3718 Restored data delivery subscription backup web page" into omaha_14.4.1
Former-commit-id: f0243b5e5f [formerly e7fbc0c012] [formerly f0243b5e5f [formerly e7fbc0c012] [formerly b41be59fd6 [formerly d3fa6c45ca179e5196af8078ae45ccb4a883804e]]]
Former-commit-id: b41be59fd6
Former-commit-id: f725b827eb [formerly 421fb43d60]
Former-commit-id: 8f4e482678
2014-10-10 11:13:12 -05:00
Benjamin Phillippe
ad58fdbb57 Omaha #3718 Restored data delivery subscription backup web page
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734

Former-commit-id: a7d5db57d8 [formerly 825aa0d5b2] [formerly a7d5db57d8 [formerly 825aa0d5b2] [formerly df6b3b3832 [formerly f7c7fe2f7b845563335559839a832b26c2ad2b2a]]]
Former-commit-id: df6b3b3832
Former-commit-id: 48f13629a7 [formerly d7c1c5805f]
Former-commit-id: e2ec6c4a0b
2014-10-10 10:59:16 -05:00
David Friedman
13e46506b8 ASM #258 - cross section - switching the log plot to z-coordinate scale
Change-Id: Ie2fd21c0b65d17f778d69daf7120e47a6f4e552a

Former-commit-id: 676ee09f11 [formerly 40f7e8df44] [formerly 676ee09f11 [formerly 40f7e8df44] [formerly ad73a90b53 [formerly f187f262a28e0ee9df2b75eff7d1f5382a729ac3]]]
Former-commit-id: ad73a90b53
Former-commit-id: a90bb5d7df [formerly 96a5bd13cc]
Former-commit-id: 487c6d9b66
2014-10-10 14:18:54 +00:00
Nate Jensen
753bb66398 Omaha #3549 remove unnecessary @Column annotations from TextRecord
Change-Id: I5f36baf0c7b697782379bef0dd5c28d8cb60e77e

Former-commit-id: 974113a995 [formerly afb64bc4bb] [formerly 974113a995 [formerly afb64bc4bb] [formerly b638e6e0f6 [formerly 4a5b66b00fbb53b4fcb4340366347ae4b08e6992]]]
Former-commit-id: b638e6e0f6
Former-commit-id: 57fac3e239 [formerly c552655866]
Former-commit-id: e3eb361995
2014-10-10 09:01:29 -05:00
Nate Jensen
b2d2db7eb2 Merge "Omaha #3644 Remove dataURI from ccfp plugin" into omaha_14.4.1
Former-commit-id: d10d25e425 [formerly 3cc3b38539] [formerly d10d25e425 [formerly 3cc3b38539] [formerly ee51fe1977 [formerly 8a0cf09901a2ffec4b67bc1d993a4c545bffa8bc]]]
Former-commit-id: ee51fe1977
Former-commit-id: 3cca074583 [formerly 2c17405d5f]
Former-commit-id: 9098eaac2a
2014-10-09 18:30:33 -05:00
Mark Peters
c906433c99 Omaha #3644 Remove dataURI from ccfp plugin
Change-Id: I35e2e9239e6059f64c444d173b0a745d889abc27

Former-commit-id: c20d19a2d3 [formerly cf1bff0d02] [formerly c20d19a2d3 [formerly cf1bff0d02] [formerly 6bb4f5dbdf [formerly 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea]]]
Former-commit-id: 6bb4f5dbdf
Former-commit-id: 95a34bd053 [formerly 5b5fac85b8]
Former-commit-id: c3665bccd9
2014-10-09 15:30:23 -05:00
Mark Peters
4864414e11 Omaha #3629 Fix null pointer exceptions from matchElement() replacements
Change-Id: I9fcf81c5179f099c1813f0fa1086c85bdcff4513

Former-commit-id: 7f3eb45256 [formerly 087dabe3bb] [formerly 7f3eb45256 [formerly 087dabe3bb] [formerly 63069f5adc [formerly e0330ab61d027ee3b8512230b64000bb7f3d71f1]]]
Former-commit-id: 63069f5adc
Former-commit-id: 1af7b2d388 [formerly bcb39bffb5]
Former-commit-id: a87212a8d7
2014-10-09 11:17:53 -05:00
Ron Anderson
2b0b7ba3e3 Issue #3684 Fix GFE notification sending
Change-Id: I3b2ab7f454cb9454a9827ef994002d1b2348f462

Former-commit-id: 95b1633c25 [formerly c7bf818989] [formerly 95b1633c25 [formerly c7bf818989] [formerly 5368107615 [formerly b538cd55c0662d3d593522817986109c7e03625a]]]
Former-commit-id: 5368107615
Former-commit-id: df266c342f [formerly a65682953c]
Former-commit-id: eb776bb033
2014-10-09 09:21:29 -05:00
Ron Anderson
66bffa25f6 Issue #3684 Fix NPE in GridParmManager
Change-Id: I9b40e8cbf0032ca531723ff782b77e1ac9750c84

Former-commit-id: e059bf4927 [formerly 4d0c1b3151] [formerly e059bf4927 [formerly 4d0c1b3151] [formerly a144571566 [formerly bcc256c7c4a737a822ac30d0de8d3378818917da]]]
Former-commit-id: a144571566
Former-commit-id: a1ff4e85a4 [formerly cdb9971dd6]
Former-commit-id: 2a17058184
2014-10-08 18:39:56 -05:00
Ron Anderson
bf67ffb281 Issue #3684 Fix some issues found after #3684 with certain GFE configurations
Change-Id: I92b45588d9d4fe9169708c07119767017426d468

Former-commit-id: 8225700629 [formerly 4a1a3aef82] [formerly 8225700629 [formerly 4a1a3aef82] [formerly a64a36d182 [formerly 6dc55b51414414aa416c9ad0c688d1d34ba08c17]]]
Former-commit-id: a64a36d182
Former-commit-id: 99d72fd962 [formerly 12c80fbe38]
Former-commit-id: b4c999b713
2014-10-08 18:05:27 -05:00
Ben Steffensmeier
f850818be8 Omaha #3674 Fix a few viirs projection bugs.
Former-commit-id: 314014503f [formerly b7c0eb89ad] [formerly 314014503f [formerly b7c0eb89ad] [formerly b865762b4f [formerly e0ec387c62e64a19a4d598578f18ee17686f312a]]]
Former-commit-id: b865762b4f
Former-commit-id: ea47d859c6 [formerly 44d2085dad]
Former-commit-id: 254c1e7130
2014-10-08 12:21:03 -05:00
Juliya Dynina
d85ac13c86 Merge "ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM" into asm_14.3.1
Former-commit-id: 1fb3bdb8a1 [formerly 240917cf96] [formerly 1fb3bdb8a1 [formerly 240917cf96] [formerly 4911f61f10 [formerly 7a0da7440a3e5e1696cc676dc3405d2aaa95252b]]]
Former-commit-id: 4911f61f10
Former-commit-id: 3504f48099 [formerly 404d6667fb]
Former-commit-id: 09ebdd8a25
2014-10-08 12:00:39 -05:00
Ron Anderson
e328261d17 VLab Issue #4953 Refactored TPCWatchSrv to support TCV effort.
Change-Id: I8a5c5c7fa62235fdc6fa4d90e82ff2711e724a15

Former-commit-id: c6eb7c137c [formerly be856e2981] [formerly c6eb7c137c [formerly be856e2981] [formerly fa7b06c454 [formerly 9a2a6989687c749ee87291506a7ee44a6cd7e737]]]
Former-commit-id: fa7b06c454
Former-commit-id: 0dff055055 [formerly bc21b6e798]
Former-commit-id: 39031e087f
2014-10-08 11:51:00 -05:00
Nate Jensen
a3f23422a7 Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
Former-commit-id: 2502976504 [formerly 4e582d0bde] [formerly 2502976504 [formerly 4e582d0bde] [formerly 5cf1821a6a [formerly 87f49d9bcc07d2178a535fc934d02cab36063894]]]
Former-commit-id: 5cf1821a6a
Former-commit-id: 53c464b647 [formerly 32fda0ae19]
Former-commit-id: 9135b7458f
2014-10-08 11:36:44 -05:00
Richard Peter
3998dac2f0 Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632

Former-commit-id: f5dd25c8e4 [formerly a4bfd2d28b] [formerly f5dd25c8e4 [formerly a4bfd2d28b] [formerly a9562d992c [formerly 110499cec453532545431a6fa05057f47af66ed2]]]
Former-commit-id: a9562d992c
Former-commit-id: 901877ec7a [formerly 1be207dccb]
Former-commit-id: 1ec3bdd877
2014-10-07 16:32:48 -05:00
Richard Peter
7bb803b504 Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
Former-commit-id: ee86734625 [formerly 1adac05f5a] [formerly ee86734625 [formerly 1adac05f5a] [formerly 1bc24c3be2 [formerly 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5]]]
Former-commit-id: 1bc24c3be2
Former-commit-id: 4f056d76c8 [formerly c6cb389a3d]
Former-commit-id: 327d82ed02
2014-10-07 15:13:11 -05:00
Sean Webb
89720ee6a6 Merge "ASM #15672 - fixed script to allow for full path of input file to be passed" into asm_14.3.1
Former-commit-id: c90be3ba42 [formerly c3f3140c4f] [formerly c90be3ba42 [formerly c3f3140c4f] [formerly 01b52daea2 [formerly 986a78cef3d8814e04035b00545a289171c7cc8a]]]
Former-commit-id: 01b52daea2
Former-commit-id: 8fa1b81841 [formerly e72d2cdc73]
Former-commit-id: 4659b14c23
2014-10-07 14:04:58 -05:00
Kevin.Johnson
99b25084ee ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae

Former-commit-id: dcecf025a2 [formerly 355274e7ac] [formerly dcecf025a2 [formerly 355274e7ac] [formerly 5cf5cac9f7 [formerly 0982ab6536679921a6afdc85166fe57e92aeac63]]]
Former-commit-id: 5cf5cac9f7
Former-commit-id: 617128a462 [formerly b0e68c1ed1]
Former-commit-id: 6698928cff
2014-10-07 14:55:41 -04:00