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

4820 commits

This branch
This branch
All branches
Author SHA1 Message Date
steve.naples
32e931cead ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly. 
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5

Former-commit-id: 75be620d0d [formerly f6636a3dd7] [formerly 75be620d0d [formerly f6636a3dd7] [formerly 7624f7ab75 [formerly 1c71a34944c7d823742b98dc65e19fe1f478eef0]]]
Former-commit-id: 7624f7ab75
Former-commit-id: cfa9c6f01c [formerly 050238ee44]
Former-commit-id: 571efe3596
 2014-04-04 15:30:18 +00:00
David Friedman
8f8f55dd3c Merge branch 'master_14.2.2' into asm_14.2.2 
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: 32a7adbe4b [formerly fd900e38c2] [formerly 32a7adbe4b [formerly fd900e38c2] [formerly f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1168a3eae5 [formerly 533d15c863]
Former-commit-id: dde12b4fc3
 2014-03-27 19:17:03 +00: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
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
steve.naples
f0b105bbdf ASM #428 Updated SATPRE file header to correct reftime. 
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204

Former-commit-id: 64b19f2e41 [formerly d0f4df4ad9] [formerly 64b19f2e41 [formerly d0f4df4ad9] [formerly 1aa970164f [formerly e51a12ae977528eb85d2c59505ac5be92d945cfe]]]
Former-commit-id: 1aa970164f
Former-commit-id: 885ceb834b [formerly 9c9ddaba6a]
Former-commit-id: 47e1a3627f
 2014-03-19 18:16:41 +00:00
Juliya Dynina
668c24997d Merge "ASM #338 Updated HRAPCoordinates to not parse whitespace" into asm_14.2.2 
Former-commit-id: 34b6972f79 [formerly 9aa170ca5f] [formerly 34b6972f79 [formerly 9aa170ca5f] [formerly 7a14dfb5a9 [formerly 8f842b0defba552ebbbe980b42dfb7618a2a7ccd]]]
Former-commit-id: 7a14dfb5a9
Former-commit-id: f4c1f51b2c [formerly e939d718e5]
Former-commit-id: b5c93d06e6
 2014-03-18 13:52:48 -05:00
steve.naples
2d22f976f4 ASM #338 Updated HRAPCoordinates to not parse whitespace 
Change-Id: I353e8a07927f3e36aa8905506f63b0e50f2179a6

Former-commit-id: 46675eec43 [formerly 309ff4e7f7] [formerly 46675eec43 [formerly 309ff4e7f7] [formerly 75e8a907fe [formerly 220ef7b1195366834c9f85b828862f128dd3fea1]]]
Former-commit-id: 75e8a907fe
Former-commit-id: 2ff30dac48 [formerly 54cc3397ee]
Former-commit-id: 72d6b1f1a5
 2014-03-18 15:40:13 +00:00
Juliya Dynina
5505320aa3 Merge "ASM #330 - Fix reloading of TextDB static files" into asm_14.2.2 
Former-commit-id: 30545f79c5 [formerly 85fd3b3888] [formerly 30545f79c5 [formerly 85fd3b3888] [formerly ef873880b6 [formerly 0d338537015e8e8a98fa67bc658fa3a4ed0f15f0]]]
Former-commit-id: ef873880b6
Former-commit-id: bd6ae766c2 [formerly 67f8f79e9f]
Former-commit-id: cc3e0b3360
 2014-03-18 08:47:22 -05:00
Juliya Dynina
de68dcfeb4 Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2 
Former-commit-id: d6e2b7f741 [formerly c735051e00] [formerly d6e2b7f741 [formerly c735051e00] [formerly 867f00b438 [formerly 669d66d3b8279833df4a361c961c113e653a542d]]]
Former-commit-id: 867f00b438
Former-commit-id: ed07060240 [formerly c54631024a]
Former-commit-id: d34b5c1a2c
 2014-03-18 08:13:51 -05:00
David Friedman
cf85796def ASM #330 - Fix reloading of TextDB static files 
Change-Id: I23c6f2883c5ce645854283996fd391f805b2b4f5

Former-commit-id: fd203b5999 [formerly 15ca9f4dcc] [formerly fd203b5999 [formerly 15ca9f4dcc] [formerly decdadce01 [formerly 0a94094f0f140de68da634cbc6c79039507712ca]]]
Former-commit-id: decdadce01
Former-commit-id: f19895db07 [formerly 9beaf9be16]
Former-commit-id: 5fe3990a9e
 2014-03-18 13:12:40 +00:00
Qinglu.Lin
119fc9840e ASM #335 - Watch wording not being inserted for SMW and SMW followup 
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05

Former-commit-id: 09e90dfe43 [formerly 4b3c821ce0] [formerly 09e90dfe43 [formerly 4b3c821ce0] [formerly af82143e84 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]]]
Former-commit-id: af82143e84
Former-commit-id: 1b352b8600 [formerly bd7d68bd16]
Former-commit-id: 72b8b32e25
 2014-03-17 18:17:49 -04:00
Matthew Howard
ab71d9e4d4 Merge "ASM #84 - fix default time range for smart tools" into asm_14.2.2 
Former-commit-id: 30e8d76f50 [formerly c1433db0fb] [formerly 30e8d76f50 [formerly c1433db0fb] [formerly 1d15cda9fd [formerly 1b46d5c169709a9498a5eb9963286a6223089af4]]]
Former-commit-id: 1d15cda9fd
Former-commit-id: 4ec6bd0a21 [formerly 6b5bbb1270]
Former-commit-id: 930eb52d95
 2014-03-14 19:47:32 -05:00
Rici.Yu
f32491f913 ASM #84 - fix default time range for smart tools 
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99

Former-commit-id: c559ade333 [formerly 74b1c827ee] [formerly c559ade333 [formerly 74b1c827ee] [formerly 58f9857344 [formerly cfb3459d6314afa396c89b90bf42ab539fd15d8c]]]
Former-commit-id: 58f9857344
Former-commit-id: e877c81c88 [formerly 0ee8baf0c3]
Former-commit-id: 1684740d02
 2014-03-14 14:39:56 -04: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
Juliya Dynina
a732e97bba Merge "ASM #380 - Hydro--TimeSeries:error thrown when click Table button" into asm_14.2.2 
Former-commit-id: 2a9de9706e [formerly 6ac6f6f1fc] [formerly 2a9de9706e [formerly 6ac6f6f1fc] [formerly b296595184 [formerly f28ab35657154bb028f3ca710ccc0b42d7c04b70]]]
Former-commit-id: b296595184
Former-commit-id: ced1197a83 [formerly ee8e55431b]
Former-commit-id: c2929b2bf3
 2014-03-12 11:36:38 -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
Loubna.Bousaidi
1eb79ede56 ASM #380 - Hydro--TimeSeries:error thrown when click Table button 
Change-Id: Ifca1581cbcf48346082a6afb976a927a3d878b09

Former-commit-id: 27447d7b76 [formerly 123007b18d] [formerly 27447d7b76 [formerly 123007b18d] [formerly ce2bea0a04 [formerly d2161a0fdd0bad7f8266a8b30659021edecaa549]]]
Former-commit-id: ce2bea0a04
Former-commit-id: b5cb73fd5a [formerly 6f7b1b6ca8]
Former-commit-id: 7eb94c4651
 2014-03-11 18:58:26 +00: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
steve.naples
9fc779bbfb ASM #337 MeanMonthlyPrecip updated to handle precip values from PRISM data less than 1 inch. 
Change-Id: Iffa8644f68df362d4f988fa3d1a9bd16acd4be97

Former-commit-id: 0d44e46f88 [formerly 212677f94b] [formerly 0d44e46f88 [formerly 212677f94b] [formerly 20582ab173 [formerly cd7d6876338b98c320a8d7559c518e32e90e3000]]]
Former-commit-id: 20582ab173
Former-commit-id: 38fca1641f [formerly 488d87dbe4]
Former-commit-id: dc08fb750b
 2014-03-10 17:47:25 +00:00
steve.naples
74ea78b1a5 ASM #336 MPEFieldResource updated to add case for PRISM data unit conversion. 
Change-Id: I8f129902079c051ca4fb508e43b8bf892cb19e0e

Former-commit-id: c877c8b61b [formerly 915e3c2c66] [formerly c877c8b61b [formerly 915e3c2c66] [formerly 7432b146ed [formerly 482547a4f4eaff0fc24b6d3f1103a38a9f3aa314]]]
Former-commit-id: 7432b146ed
Former-commit-id: 36e3819aad [formerly 796ba75949]
Former-commit-id: f390c8ce3c
 2014-03-10 17:40:35 +00: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