4253 commits

Author	SHA1	Message	Date
Greg Armendariz	fe5cf3f8e6	Omaha #3299 - Updated deploy-install to find features ... Change-Id: I107c16d832936d63af5dbc76b07166db119c95e2 Former-commit-id: 1a3ca4f8df [formerly 6a5463ab87 [formerly a25d39959ccdc41ab99e0eaf4ad87559adfcb362]] Former-commit-id: 6a5463ab87 Former-commit-id: 2fd4ace0a2	2015-02-25 09:51:49 -06:00
Dave Hladky	de74770e0b	Omaha #3220 Verified config file is read when an update occurs. ... Former-commit-id: 15f3234242 [formerly c7de9128a2 [formerly 9ad78f067456eb04367a9d3aca58d9f5ee330c41]] Former-commit-id: c7de9128a2 Former-commit-id: 99cc0e8764	2015-02-24 16:20:56 -06:00
Steve Harris	a4eb4e6446	Omaha #3220 - reverting #3841, #3873, and most of #3220 ... Revert "Omaha #3841 - Fixed saving problem for distance and time." This reverts commit 9b4c91d9ba [formerly bfbe322c73] [formerly 15ae209055] [formerly b8be69c429 [formerly 15ae209055 [formerly d6737249fc9d3db54a143345053acdfe889686bf]]]. Revert "Omaha #3220 - Performance - Safe Seas, Snow, Fog." This reverts commit e44794e98b [formerly efee22d0fb] [formerly 2bb8bc22a6] [formerly 9e076f7970 [formerly 2bb8bc22a6 [formerly f8ee84a324b3653a75aa3c63a793eca412e1bd81]]]. Revert "Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers." This reverts commit ec08386cc4 [formerly f08d184cfc] [formerly 9c57dab437] [formerly b8ab18d3e1 [formerly 9c57dab437 [formerly 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e]]]. Revert "Omaha #3841 - Corrected updateZones method." This reverts commit 81791694e9 [formerly 01d004673d] [formerly 24322ed6ca] [formerly 6ebe11d430 [formerly 24322ed6ca [formerly 4d133cc367ab016b378ada534cff0fcda579e323]]]. Revert "Omaha #3220 - Moved refreshing of table in the UI thread." This reverts commit c61f1676dc [formerly 974cc09ca5] [formerly d06882f4c9] [formerly fd3a6ea199 [formerly d06882f4c9 [formerly 7454b39e71eeca348f4f167b8aa70d6ce5253004]]]. Revert "Omaha #3873 - Fixed assigning timeObs for maritime record." This reverts commit fc045d397e [formerly 4b43ae6fb4] [formerly 090bc93302] [formerly 63026ac59b [formerly 090bc93302 [formerly ccdf4928b9527e85684fb0d4eaa67435f8da5559]]]. Revert "Omaha #3841 - Updated the dialogs for adding and editing a new zone/station." This reverts commit f0a1a13869 [formerly f20361a507] [formerly 8763f67abf] [formerly dc1722a8b7 [formerly 8763f67abf [formerly 5a7e13b6a6db5ca766da3ad957c12077470359e7]]]. Revert "Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors." This reverts commit c91e636d98 [formerly 1f4ed7fd1b] [formerly 9c369a9c5c] [formerly 8971f40dc2 [formerly 9c369a9c5c [formerly 5fb653e5c7f7ffff1daf53487147597a569d7d11]]]. Former-commit-id: 49a1879325 [formerly 6dc41740c8 [formerly fa81485722db0bcc734095c0639f0ac8875117b5]] Former-commit-id: 6dc41740c8 Former-commit-id: 19f7dbd0cc	2015-02-24 15:39:04 -06:00
Fay.Liang	6b09ea0d2f	Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 ... Former-commit-id: 47882c9ca1 [formerly 94a7507b9b [formerly d6d761a5170a91dbd6fed78af582bfc2a8f662a3]] Former-commit-id: 94a7507b9b Former-commit-id: da2f15f749	2015-02-24 14:56:50 -05:00
Ron Anderson	47f2095326	Issue #4099 Fix ETNs for products that span year-end. ... (cherry picked from commit c7a8c9b049ae8d73ffb61765f31374e01d1d2a33) Former-commit-id: ebb221d935 [formerly e19901c6e1 [formerly 7ca4dd9ba059035e366807d4928768121fdd0712]] Former-commit-id: e19901c6e1 Former-commit-id: 34bc29be41	2015-02-24 12:09:29 -06:00
Darrel Kingfield	7d83a053fd	VLab Issue #6585 - MRMS Menu Activation for 14.4.1; fixes #6585 ... Former-commit-id: d73e7e2d8b [formerly 00880112ba [formerly f43b83069eaf12e4190f1827eeed8d954239b164]] Former-commit-id: 00880112ba Former-commit-id: 41ece8fea1	2015-02-24 10:14:35 -06:00
David Lovely	93866e732e	Omaha #4164 Fixed AlertViz communications issue and log file directories. ... Change-Id: I8bd038487d9d2bda371915b3eb5680118429f389 Former-commit-id: e04988d5d2 [formerly d6f74b3e28 [formerly 7e61e1d6b80ba69bcbed3e8bc51d56d2811d6369]] Former-commit-id: d6f74b3e28 Former-commit-id: 1c1ab2943a	2015-02-24 08:24:33 -06:00
Ana Rivera	a851bf4d13	VLab Issue #6566 - HTI: Update six scripts and one image; fixes #6566 ... Change-Id: I49052579740e22c54c0307d3787d9656bdf30bb5 Former-commit-id: d828b762ec [formerly ccc338d7da [formerly 2f9dd9b8422b899146f73da0a3d922b32b021152]] Former-commit-id: ccc338d7da Former-commit-id: 2525e00fb2	2015-02-23 17:28:29 +00:00
Ana Rivera	a656992772	Merge branch master_14.3.2 'OB_14.3.2-15m' into tcv_14.3.2 ... Change-Id: I798ce412136ee0f30123835338920a4607909e1d Former-commit-id: ad45aae750 [formerly 3d882eed46 [formerly 70ac082595e5c9719807136ed2f2bebf61510016]] Former-commit-id: 3d882eed46 Former-commit-id: 122f2404f8	2015-02-23 15:15:18 +00:00
Steve Harris	20e23e0a9f	Merge tag 'OB_14.4.1-13m' into omaha_14.4.1 ... 14.4.1-13 Former-commit-id: 0de5743e1f [formerly 12929f7412 [formerly c75f0f600cc312a83275b767165471b458da18b7]] Former-commit-id: 12929f7412 Former-commit-id: fedaf58f2a	2015-02-20 09:57:49 -06:00
Ana Rivera	38264269e3	Merge branch 'master_14.4.1' into field_14.4.1 ... Change-Id: I855933b8c46cd835ff872a098e74f36201cf6ecb Former-commit-id: 62642d62bc [formerly 90d3fcece6 [formerly 4df76b701f4a85fd0c55f0dd9fd351d1768bd92e]] Former-commit-id: 90d3fcece6 Former-commit-id: 9c17244d9c	2015-02-20 14:04:10 +00:00
Fay.Liang	e6811857b7	Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2 ... Former-commit-id: e0917a9f3f [formerly d15246d073 [formerly 10cc507489cc2ac649242ddfbe9791aee59c8890]] Former-commit-id: d15246d073 Former-commit-id: 57d91a0794	2015-02-19 16:40:21 -05:00
Fay.Liang	1570a00f49	Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 ... Former-commit-id: 608e249e84 [formerly 585dc560b4 [formerly 2a6f8f560b6fb3825e4127fcd5b15b6c5b215ae7]] Former-commit-id: 585dc560b4 Former-commit-id: 5630c0dc37	2015-02-19 11:09:01 -05:00
Rici.Yu	05f098e4da	ASM #17120 - retrieve practice products in non-operational mode ... Change-Id: I2b76edaface7d185269e6e5ea5f032eeb3d4dab0 Former-commit-id: cc44f78fcf [formerly e62413c10b [formerly 16dccf94319fbb3a617cc5e2360d0b0aa1c9cc9c]] Former-commit-id: e62413c10b Former-commit-id: 13f179588f	2015-02-19 10:48:19 -05:00
Joshua Watson	66da4d33a7	VLab Issue #6496 - Key in sfcGrid.xml changed from HI-MOSGuide to MOSGuide-HI; fixes #6496 ... Change-Id: I4571bb639d474a86df39b7ea3bde1a23bad8f37f Former-commit-id: a1a7877f92 [formerly 20dbdea326 [formerly aa05e8a312511e61c0dd01680b536282ee733154]] Former-commit-id: 20dbdea326 Former-commit-id: 2c4042f5d9	2015-02-18 16:17:16 -05:00
Ben Steffensmeier	7936725972	Omaha #4135 Fix speckles, set no data value for derived satellite data. ... Former-commit-id: 22822c1a65 [formerly 19f1d29e52 [formerly 65a50fe832ef6260dfd0e02c9fad9cd2eed6f6f2]] Former-commit-id: 19f1d29e52 Former-commit-id: 6ec30c1372	2015-02-17 11:56:57 -06:00
Nate Jensen	76e6cd5eca	Merge "Omaha #4121 - Fix bug in caching uncovered when hperadarresult table data were corrected." into omaha_14.4.1 ... Former-commit-id: 61039e84a9 [formerly 8f39a549dc [formerly 042882e840e7aacc356f89e6385ab4ff63a6a589]] Former-commit-id: 8f39a549dc Former-commit-id: dc74e320e1	2015-02-17 08:47:55 -06:00
Mike Duff	b6379af6fb	Omaha #4121 - Fix bug in caching uncovered when hperadarresult table data were corrected. ... Change-Id: I88611082397933676c13c58f65fb29a5745ac263 Former-commit-id: 105a862d2e [formerly 705d5b4f2b [formerly f4d4701fd39202f0610e6c4621f106557648050d]] Former-commit-id: 705d5b4f2b Former-commit-id: 8119fe20a0	2015-02-17 07:57:30 -06:00
Sarah Pontius	b011d89c00	VLab Issue #6386 - HLS/TCV Beta Testing Changes; fixes #6386 ... Change-Id: Ica6e803b85c34e6d65fd268b844eaac06417909e Former-commit-id: e4a1aa13f5 [formerly 564febcc4a [formerly 5fbb83dd042795e308ca8b6aa370e4f9b0fb3291]] Former-commit-id: 564febcc4a Former-commit-id: d9ffd6a710	2015-02-13 10:12:53 -07:00
Nate Jensen	540de7c432	Merge "Omaha #4117 fix 14.3/14.4 shared display interoperability bug" into omaha_14.4.1 ... Former-commit-id: 2a57d8e886 [formerly 7df06aeb3e [formerly 2f07a0d67efd0d12e80cec06256ce30931b55d97]] Former-commit-id: 7df06aeb3e Former-commit-id: c5a601012f	2015-02-13 09:20:02 -06:00
Fay.Liang	7c53d1fccc	Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 ... Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java Former-commit-id: af8b95bb97 [formerly 8cdd180b0a [formerly fd4e0b9ada38ab93586088948809279e39a0374c]] Former-commit-id: 8cdd180b0a Former-commit-id: c95baa3c40	2015-02-13 09:34:24 -05:00
Fay.Liang	6d85666c42	Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1 ... Former-commit-id: 92d4e5b370 [formerly adc24b15b6 [formerly c08dc1a7d558fba175460ef8255fc3b7b1db5c71]] Former-commit-id: adc24b15b6 Former-commit-id: b54c101e34	2015-02-13 09:29:20 -05:00
Brian Clements	a7e397d999	Omaha #4117 fix 14.3/14.4 shared display interoperability bug ... 14.4 now defaults to sending directly to user id (if known) Change-Id: Id0d78a6f6287cebe7b6f110143b1b6a735078e5d Former-commit-id: 62a0f31c60 [formerly 2d98b0616a [formerly 424c3630897847a6b2362418618d0806093223ce]] Former-commit-id: 2d98b0616a Former-commit-id: 9485b0354e	2015-02-12 09:34:38 -06:00
David Lovely	d71e91a297	Omaha #3300 Fixing merge errors in PointPrecipPlotResource ... Change-Id: I6c5b8f0f2e590b0cf0440c1885435c2bf5649df4 Former-commit-id: 25f32b4c70 [formerly 56c3135aef [formerly e7968f03e688e7dbad9a2e87b9de7f0664997a5f]] Former-commit-id: 56c3135aef Former-commit-id: 260a818778	2015-02-12 09:16:30 -06:00
Ana Rivera	46215020b2	Merge branch 'master_14.4.1' into field_14.4.1 ... Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java Change-Id: I1d6fac5acc7e468e2ff5f79869201018d849d209 Former-commit-id: 6191c93a9c [formerly 420132b396 [formerly f6b3765fc1670db2b9ceef75be7422a07b2badcf]] Former-commit-id: 420132b396 Former-commit-id: 461db8a395	2015-02-11 22:00:40 +00:00
Steve Harris	a2d87f74f7	Merge tag 'OB_14.4.1-10m' into omaha_14.4.1 ... 14.4.1-10 Former-commit-id: 9311e6f440 [formerly 3fe3d35339 [formerly 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2]] Former-commit-id: 3fe3d35339 Former-commit-id: e76330fac0	2015-02-11 15:53:38 -06:00
Fay.Liang	8a38eb3a97	Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 ... Former-commit-id: 1208dbde06 [formerly 30859f6ee6 [formerly bc482f433223eee5f9a2fa209e1e33a39d3b3aa8]] Former-commit-id: 30859f6ee6 Former-commit-id: 8d4bab98d5	2015-02-11 15:36:05 -05:00
Fay.Liang	e36e27681e	Merge branch 'master_14.3.1' into master_14.3.2 ... Conflicts: edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java Former-commit-id: 07076f91aa [formerly 1e4522ddd2 [formerly 155801c3d418b6deb7e17ffb04c963a80d092c5a]] Former-commit-id: 1e4522ddd2 Former-commit-id: 3c6247522e	2015-02-10 10:59:16 -05:00
Ana Rivera	c2975ce69f	Merge branch 'omaha_14.4.1' into field_14.4.1 ... Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f Former-commit-id: c2f02ff4b2 [formerly bdb0e3aacb [formerly c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265]] Former-commit-id: bdb0e3aacb Former-commit-id: 631d700cf9	2015-02-10 14:41:19 +00:00
Fay.Liang	4bcae42022	Merge branch 'master_14.3.2' into master_14.4.1 ... Conflicts: cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java rpms/awips2.core/Installer.java/1.7/component.spec Former-commit-id: 43c7161dcf [formerly 59f3f87190 [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]] Former-commit-id: 59f3f87190 Former-commit-id: e3107ce1e4	2015-02-09 17:19:41 -05:00
Joshua Watson	9f53a8e0b6	VLab Issue #6363 - Fixed malformed xml in GFSLAMPGridded.xml, changed ClgHgt to CigHgt in serverConfig.py and GFSLAMPGrid.py smart init; fixes #6363 ... Change-Id: Ibee986bdef73cdb6883fdd50e725d28d3838c848 Former-commit-id: f6cf02c893 [formerly 05c119663f [formerly 0017f74dfa8ce2c3dd386ea89547ec76f87bfdff]] Former-commit-id: 05c119663f Former-commit-id: cb6420914f	2015-02-06 16:06:37 -05:00
Nate Jensen	baafc97b60	Omaha #4089 harden safety of numpy dtypes in gfe arrays ... Change-Id: Ic77b459bc4d68930418ad66680ee86069c540c1f Former-commit-id: ea273e14bf [formerly b42dec0e4a [formerly ed77ff564520c8f6ad157dd115d37d69cbfab660]] Former-commit-id: b42dec0e4a Former-commit-id: ac02fc3a81	2015-02-05 18:03:47 -06:00
Fay.Liang	caeaee86aa	Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1 ... Former-commit-id: a638fef39f [formerly d39f7915e7 [formerly 67ec942e0c89cce314d9af5c8a1bf5392ce20e52]] Former-commit-id: d39f7915e7 Former-commit-id: 801b7954c5	2015-02-05 16:16:18 -05:00
steve.naples	0cab625e2d	ASM #17101 MPE: Bad data not being written to file. ... Change-Id: Id1524abf8ae7379f5d8aac31b4d9cfff0469a577 Former-commit-id: d52da7d4fa [formerly c292ad2b08 [formerly fe3d6ffc320ea338d755c6fb19aa4f00c74c4283]] Former-commit-id: c292ad2b08 Former-commit-id: 1d02b073a4	2015-02-05 20:21:33 +00:00
Fay.Liang	85ccb8c7c3	Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1 ... Former-commit-id: 25e5ab2c1f [formerly 7b478acf31 [formerly fc7cd63addbf7974f4f8e1607fb1d4745cb81661]] Former-commit-id: 7b478acf31 Former-commit-id: b379532916	2015-02-05 15:01:17 -05:00
Richard Peter	e2be189c6a	Merge "Omaha #4086 resurrect undead textws scripting code and make it work with TextDBQuery" into omaha_14.4.1 ... Former-commit-id: 948dce2527 [formerly d9eb0d8b55 [formerly 3196b314c2f75424933163112742c3646a0529b4]] Former-commit-id: d9eb0d8b55 Former-commit-id: e7ee620ccb	2015-02-05 09:00:57 -06:00
Fay.Liang	b66a1e9c66	Merge branch 'ohd_14.3.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 ... Conflicts: cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveBestEstimate.java Former-commit-id: 326ded8d5d [formerly 551098ba35 [formerly 2b65d7a2e76d9d07f10fd6068e7c83b2a0b63975]] Former-commit-id: 551098ba35 Former-commit-id: 296a0f3e7a	2015-02-04 21:35:40 -05:00
Nate Jensen	b09704e3bf	Omaha #4086 resurrect undead textws scripting code and make it work with ... TextDBQuery Change-Id: I33ddf04b2f02ee088f7b8956c5c31e874747ddf8 Former-commit-id: fa547ac3dd [formerly b6fe8b843e [formerly 9cdf82d433bd07289002c1f4df9f5242dce0de7e]] Former-commit-id: b6fe8b843e Former-commit-id: 49440898a8	2015-02-04 16:46:21 -06:00
Slav Korolev	9b4c91d9ba	Omaha #3841 - Fixed saving problem for distance and time. ... Former-commit-id: b8be69c429 [formerly 15ae209055 [formerly d6737249fc9d3db54a143345053acdfe889686bf]] Former-commit-id: 15ae209055 Former-commit-id: bfbe322c73	2015-02-04 15:49:49 -05:00
Chip Gobs	ff7250b097	VLab Issue #6312 - RM 17094 - MPE - mapx_field_type too long for RWResult table; fixes #6312 ... Change-Id: I320c052a7d7a1579a668935e848aa378874c3ad5 Former-commit-id: 8e8e6cf1ce [formerly 2da6f9022d [formerly 9f66b0830de2377da2dc3e5598d264afc631b517]] Former-commit-id: 2da6f9022d Former-commit-id: bf4f6be9c0	2015-02-04 19:53:24 +00:00
Matthew Howard	6d90b07a36	Merge "ASM #17039 - Remove HighlightFramingCodes feature" into asm_14.4.1 ... Former-commit-id: cfc9629774 [formerly 4a46df6ed9 [formerly a68b74fd45f4da2dfe73085833432416380219f7]] Former-commit-id: 4a46df6ed9 Former-commit-id: b482802e1e	2015-02-04 11:16:20 -05:00
Rici.Yu	5ea106504c	ASM #17039 - Remove HighlightFramingCodes feature ... Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891 Former-commit-id: 1188dab0f4 [formerly 5470139b42 [formerly cb047745b4a5c523bd1ca26692c758d3e72d8ddc]] Former-commit-id: 5470139b42 Former-commit-id: 0a489fea9c	2015-02-04 10:23:30 -05:00
Steve Harris	dfa3bb1060	Merge tag 'OB_14.4.1-7m' into omaha_14.4.1 ... 14.4.1-7 Former-commit-id: 2468be4dd1 [formerly f428e16ebb [formerly 88b43275725882327d4487733e3135489874de1f]] Former-commit-id: f428e16ebb Former-commit-id: 8f2af8e359	2015-02-03 17:18:57 -06:00
steve.naples	bc33e81f77	ASM #15059 MPE: Updated Save Best Estimate to use lower case in query of mapx field. ... Change-Id: I303064502e2c7eea80577ab937f702c99b2e2065 Former-commit-id: fb6a0c3c39 [formerly e82d4d40e3 [formerly d967cdf333a9c71d4f98402a123e01359dca3bc3]] Former-commit-id: e82d4d40e3 Former-commit-id: a8f7710a65	2015-02-03 21:12:21 +00:00
steve.naples	3c1f6b4e61	ASM #16993 MPE: Fixed issue with Climo and data units issue for Monthly Precip. ... Change-Id: I958266658373d62ec8d61998cebed3099f3a11cf Former-commit-id: eccd38608c [formerly 82b0619ddd [formerly 236ebde830681a338e32b938c5fc709fae582e42]] Former-commit-id: 82b0619ddd Former-commit-id: c2a3541dd8	2015-02-03 19:32:13 +00:00
Steve Harris	d0a1514ece	Merge tag 'OB_14.4.1-6m' into omaha_14.4.1 ... 14.4.1-6 Former-commit-id: b684848820 [formerly db185ed16c [formerly 6873606777f0c7c18928b0b0814050742c256dc2]] Former-commit-id: db185ed16c Former-commit-id: 80dae4bc15	2015-02-03 11:24:39 -06:00
Fay.Liang	eafbc466a4	Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 ... Former-commit-id: f1c34884a5 [formerly ae85ade54d [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]] Former-commit-id: ae85ade54d Former-commit-id: 5550322f62	2015-02-03 11:24:57 -05:00
Ron Anderson	292c9777a4	Merge "Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up." into omaha_14.4.1 ... Former-commit-id: 933590f36a [formerly f280c0ab2e [formerly 170e3149e6cf9feb7a8ab0e2ac3ed0826b9f7b6c]] Former-commit-id: f280c0ab2e Former-commit-id: 8c6c42fe43	2015-02-02 15:04:51 -06:00
Bradley Mabe	8f0fb81e42	Merge remote branch 'origin/omaha_pgen' into ncep_14.4.1 ... Conflicts: ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResource.java ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResourceGhost.java Change-Id: I8506bb7deb4f57f5989d3513d682561948870593 Former-commit-id: de986a26ed [formerly 847c663329 [formerly a71f38e658319ac1109de6c73dfa29db35535f96]] Former-commit-id: 847c663329 Former-commit-id: e8dc39ee79	2015-02-02 15:49:14 -05:00
Ron Anderson	f9c31d4237	Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up. ... Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2 Former-commit-id: 346ea417ea [formerly bdc365d9c9 [formerly 9d2f64b08acbec0567c7f29871480827ff0f6de7]] Former-commit-id: bdc365d9c9 Former-commit-id: 67443be919	2015-02-02 11:26:59 -06:00