Commit graph

7245 commits

Author SHA1 Message Date
Brian.Dyke
36b350f10f Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: f3c8f4eeb0 [formerly 7953b736e5 [formerly 86a76b3fe6] [formerly f3c8f4eeb0 [formerly 53bfd53b6fea22c354fa6ca501ebfb3ff937f4f2]]]
Former-commit-id: 7953b736e5 [formerly 86a76b3fe6]
Former-commit-id: 7953b736e5
Former-commit-id: 537e0b5230
2014-10-16 11:20:36 -04:00
Nate Jensen
a4670c5dfc Merge "Omaha #3730 export postprocessors package" into omaha_14.4.1
Former-commit-id: a1929bed50 [formerly 0ce6914322 [formerly d5e5ba4103] [formerly a1929bed50 [formerly 7aaa064a36a6082ee5fe53c681ddfad0b4d4b87b]]]
Former-commit-id: 0ce6914322 [formerly d5e5ba4103]
Former-commit-id: 0ce6914322
Former-commit-id: dc35445efb
2014-10-16 10:11:20 -05:00
Ben Steffensmeier
89c10b3823 Omaha #3681 Allow satellite to be asynchronously interrogated.
Former-commit-id: ba4eeff346 [formerly ed00f845b3 [formerly 5292ea66a4] [formerly ba4eeff346 [formerly fbbb449f55668be653b15ff943cdc567cd1b662b]]]
Former-commit-id: ed00f845b3 [formerly 5292ea66a4]
Former-commit-id: ed00f845b3
Former-commit-id: 32f35bff96
2014-10-15 20:24:44 -05:00
Nate Jensen
26e34add10 Omaha #3730 export postprocessors package
Change-Id: Ie87558540777c1cea7354b040e386ba67f835311

Former-commit-id: d5a5d55265 [formerly 2fc8887e08 [formerly 5dd168e76a] [formerly d5a5d55265 [formerly db613b63005c2763ca94851182042867aedd43c9]]]
Former-commit-id: 2fc8887e08 [formerly 5dd168e76a]
Former-commit-id: 2fc8887e08
Former-commit-id: 31e5ac66b4
2014-10-15 14:46:12 -05:00
Greg Armendariz
9c6bd96723 Merge "Omaha #3676 harden numpy array to java array conversions to work with newer versions of python/numpy and not crash when heap cannot be allocated" into omaha_14.4.1
Former-commit-id: 21042a8945 [formerly b62baa3b3b [formerly bb418e47ed] [formerly 21042a8945 [formerly 57052aea644edc471adc3961739e07d4dcf80197]]]
Former-commit-id: b62baa3b3b [formerly bb418e47ed]
Former-commit-id: b62baa3b3b
Former-commit-id: a8ecc9e313
2014-10-15 14:19:28 -05:00
Ana Rivera
af867a24f4 VLab Issue #5014; Workaround pqact pattern for ESTOFS (RM 295); fixes #5014
Change-Id: I77529f91b0d6b59640bda21be909f84fdc049614

Former-commit-id: 927b2dea69 [formerly ee4cdc015f [formerly f516cc441d] [formerly 927b2dea69 [formerly 721938a9fd9a270a2b886eb19de6df70fd62555d]]]
Former-commit-id: ee4cdc015f [formerly f516cc441d]
Former-commit-id: ee4cdc015f
Former-commit-id: 3b5fd4499b
2014-10-15 18:41:58 +00:00
Brian.Dyke
7082913866 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: e6ac4980b9 [formerly cb92ade16f [formerly 41e3037133] [formerly e6ac4980b9 [formerly b0fef17ac648ed5d13d6125fa600c915b131147d]]]
Former-commit-id: cb92ade16f [formerly 41e3037133]
Former-commit-id: cb92ade16f
Former-commit-id: 43ecc95cb9
2014-10-15 13:55:32 -04:00
Nate Jensen
ba6bfb5d44 Omaha #3676 harden numpy array to java array conversions to work with
newer versions of python/numpy and not crash when heap cannot be
allocated

Change-Id: I2a83f6e2720de331188ae5b42dd8c86b14900288

Former-commit-id: b23d42f561 [formerly 852fe79de3 [formerly 433e8b6fc1] [formerly b23d42f561 [formerly 67630fce01ecbd64a760211820af5b5eaff4cade]]]
Former-commit-id: 852fe79de3 [formerly 433e8b6fc1]
Former-commit-id: 852fe79de3
Former-commit-id: 08b6622cec
2014-10-15 09:02:07 -05:00
Steve Harris
637c664043 Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: f2fdf98d2f [formerly 4fde31539e [formerly aff75d954b] [formerly f2fdf98d2f [formerly 4be51191bc64978e3c455702bede3456666fbffe]]]
Former-commit-id: 4fde31539e [formerly aff75d954b]
Former-commit-id: 4fde31539e
Former-commit-id: 85d5b72d04
2014-10-15 08:42:02 -05:00
Mark Peters
5636e62a94 Omaha #3720 Remove dataURI from redbook plugin
Change-Id: Iaeef7a259a51840fa51e1256ed8dc1c5b3df3a49

Former-commit-id: 06c9d6f7e9 [formerly 4a121ecbd5 [formerly 153cf12248] [formerly 06c9d6f7e9 [formerly 5d3c2eb58fce655b25bf4db2a2045e9007ca58f8]]]
Former-commit-id: 4a121ecbd5 [formerly 153cf12248]
Former-commit-id: 4a121ecbd5
Former-commit-id: cb060fb534
2014-10-14 17:13:23 -05:00
Nate Jensen
309b4dfbb7 Merge "Omaha #3708 fixed possible NPE in SiteConfigurationManager" into omaha_14.4.1
Former-commit-id: 36049926a4 [formerly 30f1771008 [formerly 0105b3bacf] [formerly 36049926a4 [formerly 876038997360dfef757f2864558de06e54fc8b45]]]
Former-commit-id: 30f1771008 [formerly 0105b3bacf]
Former-commit-id: 30f1771008
Former-commit-id: 47326d08fe
2014-10-14 15:53:22 -05:00
Brian Clements
b59d505a41 Omaha #3708 fixed possible NPE in SiteConfigurationManager
Change-Id: Ic63d25ed626bec38fea2374c4122d29b44e064ab

Former-commit-id: 0a42113bbb [formerly 158aa3f439 [formerly 180696a594] [formerly 0a42113bbb [formerly 21924a6b536409681073f65d769bef53db049102]]]
Former-commit-id: 158aa3f439 [formerly 180696a594]
Former-commit-id: 158aa3f439
Former-commit-id: 847d9c9925
2014-10-14 15:49:36 -05:00
Mark Peters
ed3a1a11a0 Omaha #3722 Remove dataURI from taf plugin
Change-Id: I214772ee74989ab9f91423c2bad4ee7d58b3eba4

Former-commit-id: 708f961708 [formerly d397d917c9 [formerly e7388847d6] [formerly 708f961708 [formerly 3a0cc08b25395cb168c8344c00fb17fb016aae36]]]
Former-commit-id: d397d917c9 [formerly e7388847d6]
Former-commit-id: d397d917c9
Former-commit-id: 6f82a7ecd9
2014-10-14 11:13:03 -05:00
Juliya Dynina
d7d47432f6 Merge "ASM #16844 - WarnGen can become disabled when moving storm track" into asm_14.3.1
Former-commit-id: 1421171def [formerly bc1c9b692d [formerly 9825175171] [formerly 1421171def [formerly 64318d29379dc904be07fa6bc1d38a51642e0476]]]
Former-commit-id: bc1c9b692d [formerly 9825175171]
Former-commit-id: bc1c9b692d
Former-commit-id: 517a158c00
2014-10-14 07:10:10 -05:00
Brian Clements
d1efcc3014 Omaha #3675 startup shutdown log name includes child pid
fixed capture

Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7

Former-commit-id: 6d6d3d26e6 [formerly 78c2aa3650 [formerly 3a12ab9bdf] [formerly 6d6d3d26e6 [formerly 84a91d7b11790d4a37abc9b0a5c2d64952321b52]]]
Former-commit-id: 78c2aa3650 [formerly 3a12ab9bdf]
Former-commit-id: 78c2aa3650
Former-commit-id: 3207d12d51
2014-10-13 16:32:41 -05:00
Richard Peter
a34a315c4c Merge "Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid" into omaha_14.4.1
Former-commit-id: 360114be70 [formerly ef5fcfe852 [formerly d2909b6e08] [formerly 360114be70 [formerly a7b644d5e831bc38f0442efc16f681fd5ff317d7]]]
Former-commit-id: ef5fcfe852 [formerly d2909b6e08]
Former-commit-id: ef5fcfe852
Former-commit-id: eb68a84c26
2014-10-13 12:37:28 -05:00
Brian Clements
5b24d1fd57 Omaha #3708 collaboration feed room supports blacklists
refactored SiteConfigurationManager

Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5

Former-commit-id: 2a7feaebfe [formerly c33a5ad562 [formerly dfb43fda31] [formerly 2a7feaebfe [formerly 9b2e76141b7cdd49c145d9d54f83e49ba3ea0d78]]]
Former-commit-id: c33a5ad562 [formerly dfb43fda31]
Former-commit-id: c33a5ad562
Former-commit-id: 7d4dbd204e
2014-10-13 11:11:32 -05:00
Nate Jensen
9a5a3f7a3b Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid
Change-Id: Ibabf5e3f053c8796b70bb95de2459374891f7e59

Former-commit-id: 3eada560b7 [formerly 5ae522c32a [formerly b24faf99cd] [formerly 3eada560b7 [formerly 12b8010ec08ec512a79d90b5ae3b3403acfa1c8c]]]
Former-commit-id: 5ae522c32a [formerly b24faf99cd]
Former-commit-id: 5ae522c32a
Former-commit-id: 325a15e08f
2014-10-13 09:34:22 -05:00
Nate Jensen
fc4a9f4d57 Merge "Omaha #3711 Allow configuration of how chat lines will display" into omaha_14.4.1
Former-commit-id: 8ccb625dc4 [formerly 3b54d07fa2 [formerly 190a85c872] [formerly 8ccb625dc4 [formerly f36afc27474267133b414d13951c271c5217f4dd]]]
Former-commit-id: 3b54d07fa2 [formerly 190a85c872]
Former-commit-id: 3b54d07fa2
Former-commit-id: 0ad0f650b5
2014-10-10 14:45:54 -05:00
Juliya Dynina
f0e4688d8e Merge "ASM #258 - cross section - switching the log plot to z-coordinate scale" into asm_14.3.1
Former-commit-id: 32b7e80d82 [formerly 6beb107913 [formerly 33e30cab01] [formerly 32b7e80d82 [formerly 5a639cc5850b906df927db1069bcf60cd68f15ab]]]
Former-commit-id: 6beb107913 [formerly 33e30cab01]
Former-commit-id: 6beb107913
Former-commit-id: 7cdf797188
2014-10-10 14:43:13 -05:00
David Friedman
0f87213ea9 ASM #16844 - WarnGen can become disabled when moving storm track
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a

Former-commit-id: 68f985d668 [formerly 455f1ad7aa [formerly 955809450d] [formerly 68f985d668 [formerly f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2]]]
Former-commit-id: 455f1ad7aa [formerly 955809450d]
Former-commit-id: 455f1ad7aa
Former-commit-id: b8556f48c4
2014-10-10 19:33:21 +00:00
Mark Peters
cca745dade Omaha #3711 Allow configuration of how chat lines will display
Change-Id: Ibe66602c4e527a265be4ce9758652eaebdbe132f

Former-commit-id: fb6131869c [formerly f8e3c8412b [formerly 5d87f3d22d] [formerly fb6131869c [formerly b929d424107b0a2495f4305fd2500e362cccce4e]]]
Former-commit-id: f8e3c8412b [formerly 5d87f3d22d]
Former-commit-id: f8e3c8412b
Former-commit-id: 4660b63394
2014-10-10 14:25:38 -05:00
Nathan Bowler
4048efedec Omaha #3595 Register two more fields. Replace UEngine with DAF and properly call the script
Change-Id: I3dac64f0537877858f9cf0bbf9e394e0e56075ba

Former-commit-id: 33e141dd38 [formerly db82cdbdfe [formerly 1df2418409] [formerly 33e141dd38 [formerly e1470cb4ce03b49ac85936760469a22786195a99]]]
Former-commit-id: db82cdbdfe [formerly 1df2418409]
Former-commit-id: db82cdbdfe
Former-commit-id: 74275e8715
2014-10-10 13:20:04 -04:00
Brian.Dyke
575d180315 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 05e4e92e65 [formerly a1de83a7a8 [formerly 862712a00f] [formerly 05e4e92e65 [formerly 4b2f00f3baeb6715ff76beb823978605742bc13d]]]
Former-commit-id: a1de83a7a8 [formerly 862712a00f]
Former-commit-id: a1de83a7a8
Former-commit-id: 9d33c64bd2
2014-10-10 13:17:54 -04:00
Shawn.Hooper
65040de5aa ASM #13467 - GFE: Need to add Beach Hazards Statement
Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6

Former-commit-id: 0c61661989 [formerly bfa9eb0dea [formerly cea5061c61] [formerly 0c61661989 [formerly 457c467d7437c5550bb8727e813d8aa9d9c338a9]]]
Former-commit-id: bfa9eb0dea [formerly cea5061c61]
Former-commit-id: bfa9eb0dea
Former-commit-id: 328b9f9d42
2014-10-10 13:14:25 -04:00
Nate Jensen
956c0c44ac Merge "Omaha #3595 Fix sed call and man/sigw indices for proper comparison." into omaha_14.4.1
Former-commit-id: e7d524c06a [formerly 404a87b2c9 [formerly 70561d721a] [formerly e7d524c06a [formerly bcc0d1c4f9516e90205d4c140ede99910d1af3b9]]]
Former-commit-id: 404a87b2c9 [formerly 70561d721a]
Former-commit-id: 404a87b2c9
Former-commit-id: 0eb32c3d0c
2014-10-10 11:47:32 -05:00
Richard Peter
3b4d749b87 Merge "Omaha #3718 Restored data delivery subscription backup web page" into omaha_14.4.1
Former-commit-id: b41be59fd6 [formerly f0243b5e5f [formerly e7fbc0c012] [formerly b41be59fd6 [formerly d3fa6c45ca179e5196af8078ae45ccb4a883804e]]]
Former-commit-id: f0243b5e5f [formerly e7fbc0c012]
Former-commit-id: f0243b5e5f
Former-commit-id: 01eb1572dc
2014-10-10 11:13:12 -05:00
Nathan Bowler
1fef6c18b6 Omaha #3595 Fix sed call and man/sigw indices for proper comparison.
Change-Id: Iee0ce15d06e2c84ac8bb4f5a3cf82a3c237222d2

Former-commit-id: 27cdd53ea8 [formerly 453cca2ee0 [formerly 36d77f1098] [formerly 27cdd53ea8 [formerly 97555449ae12eab272ef3307297b89145b97363b]]]
Former-commit-id: 453cca2ee0 [formerly 36d77f1098]
Former-commit-id: 453cca2ee0
Former-commit-id: b8e8e83a6f
2014-10-10 12:05:16 -04:00
Benjamin Phillippe
b95401f067 Omaha #3718 Restored data delivery subscription backup web page
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734

Former-commit-id: df6b3b3832 [formerly a7d5db57d8 [formerly 825aa0d5b2] [formerly df6b3b3832 [formerly f7c7fe2f7b845563335559839a832b26c2ad2b2a]]]
Former-commit-id: a7d5db57d8 [formerly 825aa0d5b2]
Former-commit-id: a7d5db57d8
Former-commit-id: 7e7b270f68
2014-10-10 10:59:16 -05:00
Nathan Bowler
f4d74cc0c0 Omaha #3595 Adding original, unmodified raobs scripts.
Change-Id: I466b5b89790bff9887022a35deda7c9f9871bc80

Former-commit-id: 4241eab8ac [formerly 5e5256fca1 [formerly 104b47daa2] [formerly 4241eab8ac [formerly d6793fc17662a0ea0d5814524f4e641e1524ebde]]]
Former-commit-id: 5e5256fca1 [formerly 104b47daa2]
Former-commit-id: 5e5256fca1
Former-commit-id: 544b2f9fbc
2014-10-10 11:33:07 -04:00
Brian.Dyke
fcd2a9d837 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 6ae3795b7c [formerly 797a9c6c10 [formerly f85eb2d0ac] [formerly 6ae3795b7c [formerly 344f436cfabfa5c1d0aa552467be7a6f9656a1ec]]]
Former-commit-id: 797a9c6c10 [formerly f85eb2d0ac]
Former-commit-id: 797a9c6c10
Former-commit-id: 2e6f3e057a
2014-10-10 11:01:01 -04:00
David Friedman
dbfe792de4 ASM #258 - cross section - switching the log plot to z-coordinate scale
Change-Id: Ie2fd21c0b65d17f778d69daf7120e47a6f4e552a

Former-commit-id: ad73a90b53 [formerly 676ee09f11 [formerly 40f7e8df44] [formerly ad73a90b53 [formerly f187f262a28e0ee9df2b75eff7d1f5382a729ac3]]]
Former-commit-id: 676ee09f11 [formerly 40f7e8df44]
Former-commit-id: 676ee09f11
Former-commit-id: 49de7df204
2014-10-10 14:18:54 +00:00
Nate Jensen
7a4dada8a6 Omaha #3549 remove unnecessary @Column annotations from TextRecord
Change-Id: I5f36baf0c7b697782379bef0dd5c28d8cb60e77e

Former-commit-id: b638e6e0f6 [formerly 974113a995 [formerly afb64bc4bb] [formerly b638e6e0f6 [formerly 4a5b66b00fbb53b4fcb4340366347ae4b08e6992]]]
Former-commit-id: 974113a995 [formerly afb64bc4bb]
Former-commit-id: 974113a995
Former-commit-id: 81aab98b59
2014-10-10 09:01:29 -05:00
Nate Jensen
f5b3605208 Merge "Omaha #3644 Remove dataURI from ccfp plugin" into omaha_14.4.1
Former-commit-id: ee51fe1977 [formerly d10d25e425 [formerly 3cc3b38539] [formerly ee51fe1977 [formerly 8a0cf09901a2ffec4b67bc1d993a4c545bffa8bc]]]
Former-commit-id: d10d25e425 [formerly 3cc3b38539]
Former-commit-id: d10d25e425
Former-commit-id: 5ca72c6d2a
2014-10-09 18:30:33 -05:00
Nate Jensen
d092263867 Merge "Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml." into omaha_14.4.1
Former-commit-id: 22fce26b0e [formerly f70c9deacb [formerly 13f4746613] [formerly 22fce26b0e [formerly 7751e4e17ac543ba18abbd3ba7f2355c13c81d4e]]]
Former-commit-id: f70c9deacb [formerly 13f4746613]
Former-commit-id: f70c9deacb
Former-commit-id: 0e35dfff77
2014-10-09 15:32:38 -05:00
Mark Peters
d6548c9fdd Omaha #3644 Remove dataURI from ccfp plugin
Change-Id: I35e2e9239e6059f64c444d173b0a745d889abc27

Former-commit-id: 6bb4f5dbdf [formerly c20d19a2d3 [formerly cf1bff0d02] [formerly 6bb4f5dbdf [formerly 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea]]]
Former-commit-id: c20d19a2d3 [formerly cf1bff0d02]
Former-commit-id: c20d19a2d3
Former-commit-id: 94364ab115
2014-10-09 15:30:23 -05:00
Mark Peters
8488f11ac0 Omaha #3629 Fix null pointer exceptions from matchElement() replacements
Change-Id: I9fcf81c5179f099c1813f0fa1086c85bdcff4513

Former-commit-id: 63069f5adc [formerly 7f3eb45256 [formerly 087dabe3bb] [formerly 63069f5adc [formerly e0330ab61d027ee3b8512230b64000bb7f3d71f1]]]
Former-commit-id: 7f3eb45256 [formerly 087dabe3bb]
Former-commit-id: 7f3eb45256
Former-commit-id: 99b25a3031
2014-10-09 11:17:53 -05:00
Richard Peter
4dd9914e2a Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
Former-commit-id: 26e4c16da4 [formerly db0e85e501 [formerly ed2bd7a261] [formerly 26e4c16da4 [formerly 5977e37b7368487867aca1cfdd362943633f92eb]]]
Former-commit-id: db0e85e501 [formerly ed2bd7a261]
Former-commit-id: db0e85e501
Former-commit-id: fddf14712a
2014-10-09 11:09:32 -05:00
Brian Clements
a09bf85195 Omaha #3675 alertviz cleanly exits when killed by signal
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631

Former-commit-id: fbabf6f18d [formerly 8d58b8d524 [formerly 119b2bff17] [formerly fbabf6f18d [formerly 6bc42c58541363bee9be1607b1bdf2aca6f5a000]]]
Former-commit-id: 8d58b8d524 [formerly 119b2bff17]
Former-commit-id: 8d58b8d524
Former-commit-id: 2112fb8e60
2014-10-09 11:04:49 -05:00
Nate Jensen
942097d16c Merge "Omaha #3705 added collaboration public room search, bookmarking" into omaha_14.4.1
Former-commit-id: 1a24808709 [formerly 550b269370 [formerly f6601e4ee1] [formerly 1a24808709 [formerly 05a008ed69414e3977998cca45516a736181d5b6]]]
Former-commit-id: 550b269370 [formerly f6601e4ee1]
Former-commit-id: 550b269370
Former-commit-id: 91ba36db75
2014-10-09 09:38:27 -05:00
Nate Jensen
6d25456d08 Merge "Omaha #3672 moved aviation advisory plugins to separate feature" into omaha_14.4.1
Former-commit-id: 98518f4cb6 [formerly 87d33ff6ca [formerly 0d33e661f2] [formerly 98518f4cb6 [formerly 5ae10ba1a54ec5b20d1569d6c78c2762015c35de]]]
Former-commit-id: 87d33ff6ca [formerly 0d33e661f2]
Former-commit-id: 87d33ff6ca
Former-commit-id: d36751c260
2014-10-09 09:02:36 -05:00
Brian Clements
21a828d75c Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818

Former-commit-id: f0921db20c [formerly 1a6624d5d7 [formerly 87964cb500] [formerly f0921db20c [formerly 919c816ba7af2082b9dcb0308128fa1b228475d2]]]
Former-commit-id: 1a6624d5d7 [formerly 87964cb500]
Former-commit-id: 1a6624d5d7
Former-commit-id: abb6b1f258
2014-10-09 08:38:45 -05:00
Brian Clements
a576fe7687 Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f

Former-commit-id: 577b3a5e11 [formerly 4a824111ec [formerly 8a4cda892f] [formerly 577b3a5e11 [formerly 771e06df242b0fe7b4eec1e7c3099dfd316182ce]]]
Former-commit-id: 4a824111ec [formerly 8a4cda892f]
Former-commit-id: 4a824111ec
Former-commit-id: 84217692bf
2014-10-08 16:47:10 -05:00
Robert Blum
bbcb4f18bc Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml.
Change-Id: Ifee9297729b814983634d438bff355f6eddb0008

Former-commit-id: f8661bdb73 [formerly caee4eba19 [formerly 9bef0b91f8] [formerly f8661bdb73 [formerly 8c609041f3cabc11588d282b0a91b514a569073a]]]
Former-commit-id: caee4eba19 [formerly 9bef0b91f8]
Former-commit-id: caee4eba19
Former-commit-id: da4f5de40f
2014-10-08 13:05:23 -05:00
Ben Steffensmeier
97df861ee0 Omaha #3674 Fix a few viirs projection bugs.
Former-commit-id: b865762b4f [formerly 314014503f [formerly b7c0eb89ad] [formerly b865762b4f [formerly e0ec387c62e64a19a4d598578f18ee17686f312a]]]
Former-commit-id: 314014503f [formerly b7c0eb89ad]
Former-commit-id: 314014503f
Former-commit-id: 9d233500c8
2014-10-08 12:21:03 -05:00
Richard Peter
190c363e32 Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: fa15d4ff21 [formerly 04bf8666b3 [formerly e8bc97501b] [formerly fa15d4ff21 [formerly 157588d388b9033424ddc46a22d74ccc302eea85]]]
Former-commit-id: 04bf8666b3 [formerly e8bc97501b]
Former-commit-id: 04bf8666b3
Former-commit-id: a4fd6b8a09
2014-10-08 12:02:17 -05:00
Juliya Dynina
835e273807 Merge "ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM" into asm_14.3.1
Former-commit-id: 4911f61f10 [formerly 1fb3bdb8a1 [formerly 240917cf96] [formerly 4911f61f10 [formerly 7a0da7440a3e5e1696cc676dc3405d2aaa95252b]]]
Former-commit-id: 1fb3bdb8a1 [formerly 240917cf96]
Former-commit-id: 1fb3bdb8a1
Former-commit-id: ac23208143
2014-10-08 12:00:39 -05:00
Nate Jensen
d4447536e4 Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
Former-commit-id: 5cf1821a6a [formerly 2502976504 [formerly 4e582d0bde] [formerly 5cf1821a6a [formerly 87f49d9bcc07d2178a535fc934d02cab36063894]]]
Former-commit-id: 2502976504 [formerly 4e582d0bde]
Former-commit-id: 2502976504
Former-commit-id: 5886518b3b
2014-10-08 11:36:44 -05:00
Nate Jensen
8efd0bf9d6 Merge "Omaha #3594 Update profiler script to use DAF." into omaha_14.4.1
Former-commit-id: ea23c651a1 [formerly f2db612cd3 [formerly aa9567ccbe] [formerly ea23c651a1 [formerly 617994f10079a9b905f37c1bf1c1b83e6a210e61]]]
Former-commit-id: f2db612cd3 [formerly aa9567ccbe]
Former-commit-id: f2db612cd3
Former-commit-id: 460a7e917f
2014-10-07 17:18:51 -05:00
Richard Peter
597866865f Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632

Former-commit-id: a9562d992c [formerly f5dd25c8e4 [formerly a4bfd2d28b] [formerly a9562d992c [formerly 110499cec453532545431a6fa05057f47af66ed2]]]
Former-commit-id: f5dd25c8e4 [formerly a4bfd2d28b]
Former-commit-id: f5dd25c8e4
Former-commit-id: 8ffa01471a
2014-10-07 16:32:48 -05:00