xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4734 commits 31 branches 40 tags 3.8 GiB
Commit graph

4734 commits

This branch
This branch
All branches
Author SHA1 Message Date
Greg Armendariz
cd8507faf2 Merge "Issue #2949 Updated scripts Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80" into omaha_14.2.1 
Former-commit-id: 50fb1ec68a [formerly 6b339bcb86] [formerly 50fb1ec68a [formerly 6b339bcb86] [formerly 0d0d7bd513 [formerly 8d8277705568c04ac37bbe8f09bf7f38f2f0521f]]]
Former-commit-id: 0d0d7bd513
Former-commit-id: 380542d2eb [formerly cef70f2168]
Former-commit-id: 1ae96a358d
 2014-04-01 19:33:30 -05:00
Richard Peter
034e62d64e Issue #2509: Fix stitched grid notifications 
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4

Former-commit-id: bfba75f73f [formerly 53d5000261] [formerly bfba75f73f [formerly 53d5000261] [formerly f99875040c [formerly 861f0c09baa01e191b430bce6699c0f1c95a52d2]]]
Former-commit-id: f99875040c
Former-commit-id: b32eff04be [formerly 9ac8af6ccd]
Former-commit-id: 154034d653
 2014-04-01 14:44:05 -05:00
Dave Hladky
24724a8819 Issue #2949 Updated scripts 
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80

Former-commit-id: 41e43a169b [formerly 3d6ebf498e] [formerly 41e43a169b [formerly 3d6ebf498e] [formerly ede510dd91 [formerly afcfc72329522c2d731a4afe9353632effb9cb23]]]
Former-commit-id: ede510dd91
Former-commit-id: b202d62214 [formerly be18d1f63c]
Former-commit-id: a3ac9604e6
 2014-04-01 12:33:48 -05:00
David Gillingham
14f927fe54 Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1. 
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9

Former-commit-id: 402adfeddb [formerly a529bc8cad] [formerly 402adfeddb [formerly a529bc8cad] [formerly 70b28b4e1e [formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]]]
Former-commit-id: 70b28b4e1e
Former-commit-id: 64981356c8 [formerly 22266d36b9]
Former-commit-id: 3ad0872bda
 2014-03-31 15:49:33 -05:00
Steve Harris
ef058152a0 Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1 
Former-commit-id: 9cf3600ff6 [formerly 4879520391] [formerly 9cf3600ff6 [formerly 4879520391] [formerly a7efde7cf4 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]]
Former-commit-id: a7efde7cf4
Former-commit-id: 311c8d67af [formerly 55440888fd]
Former-commit-id: af32adebc5
 2014-03-26 15:51:32 -05:00
Brian.Dyke
e7aea77979 Fixed comment merge conflicts added .gitignore 
Former-commit-id: 027cca8673 [formerly 7cc471a9c9] [formerly 027cca8673 [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 412a7eb2c2 [formerly d8256c4226]
Former-commit-id: c19fc33493
 2014-03-25 15:41:58 -04:00
Brian.Dyke
2ba9b8825b OB_14.1.1-25 baseline 
Former-commit-id: c085bc6879 [formerly c67833407c] [formerly c085bc6879 [formerly c67833407c] [formerly 074abeb0fa [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]
Former-commit-id: 074abeb0fa
Former-commit-id: 95ada25b65 [formerly 36fdf6bfe4]
Former-commit-id: 05ab17425c
 2014-03-25 13:55:54 -04:00
Richard Peter
631aa74a10 Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1 
Former-commit-id: 6236137635 [formerly 390e73af44] [formerly 6236137635 [formerly 390e73af44] [formerly 897980da08 [formerly 5fee1c62ae87e59007b57ba74268b5f272648127]]]
Former-commit-id: 897980da08
Former-commit-id: a910870531 [formerly 780b504251]
Former-commit-id: 9060aab6dd
 2014-03-24 09:53:13 -05:00
Dave Hladky
a37f87968c Issue #2939 Madis data mismatches 
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2

Former-commit-id: 39343e1801 [formerly 3ac04dd071] [formerly 39343e1801 [formerly 3ac04dd071] [formerly 9f3c5dcc42 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]]
Former-commit-id: 9f3c5dcc42
Former-commit-id: e464a1d8f8 [formerly 43cbcff538]
Former-commit-id: 3d61ca32f6
 2014-03-24 08:27:12 -05:00
Mike Duff
05fbcc61ca Issue #2941 - Sort data before returning 
Former-commit-id: ff07b90659 [formerly 73a011b940] [formerly ff07b90659 [formerly 73a011b940] [formerly 4db73e42a5 [formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]]]
Former-commit-id: 4db73e42a5
Former-commit-id: 8d1347d1f7 [formerly 43eccead7c]
Former-commit-id: 8f00b37688
 2014-03-24 08:19:21 -05:00
Brian.Dyke
aea0544eec Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: 50e5f4f78d [formerly 06ee9a6384] [formerly 50e5f4f78d [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: d97b88f433 [formerly 14567f20a7]
Former-commit-id: f540c6fb2d
 2014-03-24 07:01:29 -04:00
Brian.Dyke
7aeb9af309 OB_14.1.1-24 baseline 
Former-commit-id: 37e9d48d45 [formerly 37b6368268] [formerly 37e9d48d45 [formerly 37b6368268] [formerly face1ebeeb [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]
Former-commit-id: face1ebeeb
Former-commit-id: cfa058a345 [formerly 6b2175da93]
Former-commit-id: 2fda566cfb
 2014-03-21 12:43:50 -04:00
Ben Steffensmeier
ebd80c4d49 Issue #2932 improve compatibility of pop skewT and blended resources. 
Former-commit-id: 14907292da [formerly 933b172ca0] [formerly 14907292da [formerly 933b172ca0] [formerly effb0bfcd8 [formerly 49ffd67e77fef3c76f712cdf0eaa9b5e8ecff737]]]
Former-commit-id: effb0bfcd8
Former-commit-id: 99d9ba9645 [formerly ee3cb7e69a]
Former-commit-id: b8d6663e15
 2014-03-20 13:18:40 -05:00
Nate Jensen
8ac503de37 Issue #2919 fix windows error due to gempak library missing 
Former-commit-id: 6edec10edc [formerly 747ac58166] [formerly 6edec10edc [formerly 747ac58166] [formerly 82ee3e7104 [formerly 5a2ba132d9e32ce8a018f35ba2524881e5276120]]]
Former-commit-id: 82ee3e7104
Former-commit-id: 07d2a4f40c [formerly 24eadadffd]
Former-commit-id: 557c180e6d
 2014-03-20 09:38:07 -05:00
Brian.Dyke
5fb2fe9266 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: 9f332e938c [formerly d23acbdd48] [formerly 9f332e938c [formerly d23acbdd48] [formerly 9c412e444e [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]
Former-commit-id: 9c412e444e
Former-commit-id: 57f7e4b084 [formerly 88efccf309]
Former-commit-id: 35427557c4
 2014-03-14 11:13:30 -04:00
Brian.Dyke
92ed2895fb Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1 
Former-commit-id: 24a63fb05a [formerly 030a18f804] [formerly 24a63fb05a [formerly 030a18f804] [formerly 30084d7f84 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]]
Former-commit-id: 30084d7f84
Former-commit-id: 916fec5a4f [formerly 2109409b24]
Former-commit-id: f20020876a
 2014-03-14 10:15:53 -04:00
Brian.Dyke
516ba8e81a 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: 4e3096631d [formerly d4b6d22ae2] [formerly 4e3096631d [formerly d4b6d22ae2] [formerly f999e48df0 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]
Former-commit-id: f999e48df0
Former-commit-id: 82756e3855 [formerly 3ab2df3507]
Former-commit-id: 76271269c5
 2014-03-14 08:44:39 -04:00
Brian.Dyke
be8f052cff OB_14.1.1-23 baseline 
Former-commit-id: 55918ee421 [formerly dcc2e4fd61] [formerly 55918ee421 [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]]
Former-commit-id: bc6a7bf946
Former-commit-id: e78e030b7c [formerly 8f72db144b]
Former-commit-id: c7fbd5dfe4
 2014-03-14 08:18:16 -04:00
Kevin P. Johnson
90a9e642e3 ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call 
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67

Former-commit-id: e3a951da78 [formerly b2797a0788] [formerly e3a951da78 [formerly b2797a0788] [formerly 4c833d3389 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]]
Former-commit-id: 4c833d3389
Former-commit-id: 32b372db4b [formerly 17a4229072]
Former-commit-id: eb12ec9c14
 2014-03-13 20:42:12 +00:00
Ben Steffensmeier
1bde438f3a Issue #2528 Fix satellite units/style. 
Former-commit-id: e6cd8b3167 [formerly 77041e5b17] [formerly e6cd8b3167 [formerly 77041e5b17] [formerly 75120a09cd [formerly 7e38454a31aa55c606c155a108253c0433ecb517]]]
Former-commit-id: 75120a09cd
Former-commit-id: e2995114dc [formerly d29daf8ede]
Former-commit-id: fc62e2679d
 2014-03-12 14:19:49 -05:00
Richard Peter
318c61b1bf Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1 
Former-commit-id: e981ce3e36 [formerly 18234c5d73] [formerly e981ce3e36 [formerly 18234c5d73] [formerly f59d1433db [formerly 555358125bfb925a2c8ed0d393911b4d045d18b1]]]
Former-commit-id: f59d1433db
Former-commit-id: cc35481b48 [formerly 76f15c73dd]
Former-commit-id: 937c89866d
 2014-03-11 16:43:37 -05:00
Dave Hladky
78441a1250 Issue #2678 end retrieval double clutching 
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc

Former-commit-id: 7cd4304140 [formerly 3500ad262a] [formerly 7cd4304140 [formerly 3500ad262a] [formerly 76e216d319 [formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]]]
Former-commit-id: 76e216d319
Former-commit-id: f3876233e4 [formerly 03fd32144a]
Former-commit-id: c0d2eb8f6b
 2014-03-11 15:53:59 -05:00
Nate Jensen
39d73f1569 Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1 
Former-commit-id: cef0438c35 [formerly 85f5821a6f] [formerly cef0438c35 [formerly 85f5821a6f] [formerly afbdf6962c [formerly d463531d4cf3bce8862ce1c29b12e9a594d8c63b]]]
Former-commit-id: afbdf6962c
Former-commit-id: 3411167042 [formerly 09f4bd9883]
Former-commit-id: be9744c6f9
 2014-03-11 12:35:44 -05:00
David Gillingham
0e0fdae804 Issue #2509: Fix static topo generation break caused by baseline merge. 
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68

Former-commit-id: e3a3cf7bad [formerly b0783b64ce] [formerly e3a3cf7bad [formerly b0783b64ce] [formerly 187196b519 [formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]]]
Former-commit-id: 187196b519
Former-commit-id: 4179172d0e [formerly 68edb8d9a1]
Former-commit-id: f30292b471
 2014-03-11 11:54:25 -05:00
Ben Steffensmeier
470ac4a1b9 Issue #2896 Fix sat best res on weird projections 
Former-commit-id: c7fa392f3f [formerly 8bb517836a] [formerly c7fa392f3f [formerly 8bb517836a] [formerly 560fc688bc [formerly 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb]]]
Former-commit-id: 560fc688bc
Former-commit-id: 7a06fdd71a [formerly b474e92189]
Former-commit-id: 30683880ee
 2014-03-11 11:07:43 -05:00
Nate Jensen
391deee18c Issue #2779 update memory settings for renamed NC perspective 
Former-commit-id: 17aa39ce0a [formerly ccb06db199] [formerly 17aa39ce0a [formerly ccb06db199] [formerly 5eb892f4cf [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]]
Former-commit-id: 5eb892f4cf
Former-commit-id: 42c545804c [formerly 22ff235bcf]
Former-commit-id: 15a2fb216e
 2014-03-11 10:28:01 -05:00
Brian.Dyke
b301ef8190 Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1 
Former-commit-id: fa16721854 [formerly 552490206f] [formerly fa16721854 [formerly 552490206f] [formerly fcc9115b0d [formerly eaa41b4f2dd9fce2d957a2311ee3f4f04f220365]]]
Former-commit-id: fcc9115b0d
Former-commit-id: 3070b42ed3 [formerly 83822661e8]
Former-commit-id: fdaab3d981
 2014-03-11 10:44:03 -04:00
Juliya Dynina
ddf1c4f4f6 Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1 
Former-commit-id: b3ec4c363f [formerly 6bbd88e62c] [formerly b3ec4c363f [formerly 6bbd88e62c] [formerly 7952862443 [formerly a167748b77baad66784893304a18e8866f5471f1]]]
Former-commit-id: 7952862443
Former-commit-id: bedc9082b0 [formerly 7e35f36651]
Former-commit-id: 7966aac771
 2014-03-11 09:24:12 -05:00
Brian.Dyke
305b2563fa Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1 
Former-commit-id: bcf9a5dc83 [formerly c6f2010ce6] [formerly bcf9a5dc83 [formerly c6f2010ce6] [formerly 4269f9d875 [formerly 0e02910adc2ef73df2eff5b41c1e9945a5536a0a]]]
Former-commit-id: 4269f9d875
Former-commit-id: c26c40d6e3 [formerly a453d3fd68]
Former-commit-id: 57b5d77dee
 2014-03-10 15:42:38 -04:00
brian.dyke
fba0188c90 Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1 
Former-commit-id: 1a482f91bc [formerly 654778bb0d] [formerly 1a482f91bc [formerly 654778bb0d] [formerly b1b216f196 [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]
Former-commit-id: b1b216f196
Former-commit-id: d1b389ae05 [formerly d57a3dd24c]
Former-commit-id: f3df3e3690
 2014-03-10 15:36:56 -04:00
Brian.Dyke
26e19974d1 Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1 
Former-commit-id: 24785068be [formerly d710aec521] [formerly 24785068be [formerly d710aec521] [formerly fda6ab1344 [formerly ac54324fb0eff1483dd2c3aa8d94273760451dab]]]
Former-commit-id: fda6ab1344
Former-commit-id: c5502af3fa [formerly 0aff5875b0]
Former-commit-id: dcade6e18a
 2014-03-10 15:14:59 -04:00
Nate Jensen
6bafc51abe Issue #2779 add .ini generation of memory settings for other components 
Former-commit-id: 5a88f31a2b [formerly 6a75fe686a] [formerly 5a88f31a2b [formerly 6a75fe686a] [formerly d599db4af2 [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]]
Former-commit-id: d599db4af2
Former-commit-id: 39aa26c2b6 [formerly 5094008bea]
Former-commit-id: 19a0cfb972
 2014-03-10 10:03:02 -05:00
Stephen Gilbert
aaa14d1b1d VLab Issue #3224 - NSHARP: Fix erroneous mixing heights 
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2

Former-commit-id: 200c7e60da [formerly 65dd8b4c3c] [formerly 200c7e60da [formerly 65dd8b4c3c] [formerly f203a4c035 [formerly 459cd2e6772efa05a683073798a1d4424aa2facf]]]
Former-commit-id: f203a4c035
Former-commit-id: 00c1f40997 [formerly 46ebeb9969]
Former-commit-id: abb11feb16
 2014-03-07 19:10:08 -05:00
Stephen Gilbert
08b8f4c679 VLab Issue #3223 - NSHARP: Improve selection operation 
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d

Former-commit-id: 5fcb45a629 [formerly 9a457213bb] [formerly 5fcb45a629 [formerly 9a457213bb] [formerly e3aedaa1d6 [formerly 16fcc171c65d79d5698feeb3ff0ace49c31d976f]]]
Former-commit-id: e3aedaa1d6
Former-commit-id: c4b73eb02e [formerly b1e1d9178a]
Former-commit-id: 05328b9103
 2014-03-07 19:07:28 -05:00
Stephen Gilbert
5eea989db5 VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP 
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57

Former-commit-id: a7fd09a409 [formerly 1632166902] [formerly a7fd09a409 [formerly 1632166902] [formerly 49a6d6ec7e [formerly 24e07a3215a7879e459afc74e020eab0a8e1c646]]]
Former-commit-id: 49a6d6ec7e
Former-commit-id: 6d40a42c39 [formerly de6e50d8e6]
Former-commit-id: 40a62c63cd
 2014-03-07 18:49:21 -05:00
Stephen Gilbert
e0f2f91b21 VLab Issue #3221 - Fix XML serialization problems 
A few problems reading/writing XML files were noticed after upgrading to
14.2.1.  This commit fixes the saving of SPFs, reading of image style
rules, and the location of lockedColorMap file.

Change-Id: I8aad4197029c70f72612299a25329687892884af

Former-commit-id: cce06bfbe3 [formerly 625fcb0064] [formerly cce06bfbe3 [formerly 625fcb0064] [formerly 6dd6ae8d36 [formerly 4f58998c899e28521658bf17dee852592c534713]]]
Former-commit-id: 6dd6ae8d36
Former-commit-id: ce73240c40 [formerly 204d047289]
Former-commit-id: ebafac1725
 2014-03-07 18:36:42 -05:00
Steve Harris
e29b96b6bd Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 068297b90a [formerly 92232fa063] [formerly 068297b90a [formerly 92232fa063] [formerly 40b543f9a8 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]
Former-commit-id: 40b543f9a8
Former-commit-id: 4d1fbf8743 [formerly f992a6b046]
Former-commit-id: ea01373320
 2014-03-07 15:16:18 -06:00
Shawn.Hooper
df59dabcb5 ASM #224 - WarnGen: OB13.5.2 Template Errors 
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28

Former-commit-id: e894b1279a [formerly 41a4905f9f] [formerly e894b1279a [formerly 41a4905f9f] [formerly 56a949fba8 [formerly b18b8f64040b1c41810f391b8ed785327b6e5d59]]]
Former-commit-id: 56a949fba8
Former-commit-id: 84b71d7252 [formerly aa827610b1]
Former-commit-id: fb673d390f
 2014-03-07 14:53:54 -05:00
Shawn.Hooper
94a008ff56 ASM #377 - Baseline National River Location Database fails 
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae

Former-commit-id: 6a8a1c397b [formerly 670da1895b] [formerly 6a8a1c397b [formerly 670da1895b] [formerly 85db05e819 [formerly 5dcb5b019f389e64435b0283d95fe477032d88cc]]]
Former-commit-id: 85db05e819
Former-commit-id: b7cf50dd31 [formerly 62a0c1dadf]
Former-commit-id: 6401571e92
 2014-03-07 13:12:11 -05:00
Shawn.Hooper
db1c090463 ASM #378 - MPE gages are not listed/available in gage table 
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a

Former-commit-id: b46b87cb5e [formerly 8c9f9b3ae0] [formerly b46b87cb5e [formerly 8c9f9b3ae0] [formerly dc3aadd149 [formerly 55b1066b8674a044602297e64cb557ced5faf92a]]]
Former-commit-id: dc3aadd149
Former-commit-id: 68d8f9be14 [formerly 05bb380e77]
Former-commit-id: 26a112b34b
 2014-03-07 12:57:36 -05:00
Brian.Dyke
d9f1b98ce7 Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1 
Former-commit-id: 48cc3b6c55 [formerly 3ac2a61218] [formerly 48cc3b6c55 [formerly 3ac2a61218] [formerly 1fe5504d4c [formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]]]
Former-commit-id: 1fe5504d4c
Former-commit-id: 48f1f544d6 [formerly 0c4b9469b0]
Former-commit-id: 795c5424cb
 2014-03-07 11:50:06 -05:00
David Friedman
2eb0b3dfb0 ASM #349 - Workaround for QPID-5569 
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce

Former-commit-id: 103fece7b7 [formerly 2c1a3442d6] [formerly 103fece7b7 [formerly 2c1a3442d6] [formerly a58f3cb7df [formerly 18d692c17ea11537d0eb832fbe63a04b59b0040c]]]
Former-commit-id: a58f3cb7df
Former-commit-id: 91b22ff9bb [formerly 2a4a92c223]
Former-commit-id: ab5f533c72
 2014-03-07 14:58:09 +00:00
Brian.Dyke
ac07a4fc49 Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: a0e3f08fce [formerly 394076196b] [formerly a0e3f08fce [formerly 394076196b] [formerly 7b798ab5d2 [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: fa189c0ef6 [formerly 6ced1bedc2]
Former-commit-id: c8b3730fef
 2014-03-07 09:01:09 -05:00
Brian.Dyke
da36dde938 Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: 0bbf137b05 [formerly 312cd8a3e8] [formerly 0bbf137b05 [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]
Former-commit-id: 6414bdab57
Former-commit-id: 2eec413d72 [formerly 2f94480121]
Former-commit-id: 8f2271403d
 2014-03-07 08:57:07 -05:00
Brian.Dyke
c1dab50ce0 14.1.1-22 baseline 
Former-commit-id: fe30e1d545 [formerly 21f17d4f9b] [formerly fe30e1d545 [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly ae37ad5bac445251d1456f37588819fccfede061]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: 9406a1d6c0 [formerly a4c136fd60]
Former-commit-id: 067802b104
 2014-03-07 08:49:00 -05:00
Steve Harris
71c8e15b78 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 3358e8d6ef [formerly 7f1ad89df9] [formerly 3358e8d6ef [formerly 7f1ad89df9] [formerly a2e36f4c6c [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]]
Former-commit-id: a2e36f4c6c
Former-commit-id: 2371a74a29 [formerly 8ec20fc5e9]
Former-commit-id: 104b3d369a
 2014-03-06 18:19:55 -06:00
David Friedman
3dde8aeda7 ASM #74 - Fix RadarServer configuration import utility JAR dependency 
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70

Former-commit-id: fa849dfefa [formerly 11d0d191fd] [formerly fa849dfefa [formerly 11d0d191fd] [formerly d08597a0d4 [formerly 1a4183ed991cf1aed5895334c7b823a66ad58a7a]]]
Former-commit-id: d08597a0d4
Former-commit-id: 7efff2943c [formerly 591ce333dc]
Former-commit-id: 89b6f79565
 2014-03-06 17:07:23 +00:00
Brian.Dyke
4e38785329 Merge 13.5.3 DR_16824 
Former-commit-id: 7baa5ee0d5 [formerly b8fd0f16ed] [formerly 7baa5ee0d5 [formerly b8fd0f16ed] [formerly dafe7e6a42 [formerly 1b9ed749da0d1893f44e68400644f37c763e324a]]]
Former-commit-id: dafe7e6a42
Former-commit-id: 981373f82b [formerly 8c16576a82]
Former-commit-id: bcf5bf170d
 2014-03-06 11:22:08 -05:00
Brian.Dyke
0c6ba63abc ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change) 
Former-commit-id: 26fe429c4b [formerly 1778d20745] [formerly 26fe429c4b [formerly 1778d20745] [formerly 010b7a1df5 [formerly 85700a6c632125b5f1d36b37a70767fbd9819142]]]
Former-commit-id: 010b7a1df5
Former-commit-id: 14844a10b6 [formerly c6dae5a81f]
Former-commit-id: 863de85b6b
 2014-03-06 11:04:34 -05:00
Brian.Dyke
36e0ad0fdd ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf) 
Former-commit-id: 6313b7af0c [formerly 2dbac1697d] [formerly 6313b7af0c [formerly 2dbac1697d] [formerly cb1b4a7ac5 [formerly c1dc533bf7ee6500da3f6d75699ad7758a39462b]]]
Former-commit-id: cb1b4a7ac5
Former-commit-id: 57a28e817d [formerly 3fdb85c62d]
Former-commit-id: 6f5baf3984
 2014-03-06 10:56:44 -05:00