8 commits

Author	SHA1	Message	Date
Steve Harris	f4e26fd94d	Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1 ... Conflicts: cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java Former-commit-id: a9ced3a7ef [formerly fa15f03e1b] [formerly dc419068f0 [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]] Former-commit-id: dc419068f0 Former-commit-id: 31044eabd1	2013-03-20 16:06:20 -05:00
Steve Harris	e9f0328808	13.3.1-10 baseline ... Former-commit-id: 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]] Former-commit-id: 7078eec1b1 Former-commit-id: 7c2e617d26	2013-03-20 15:53:01 -05:00
Steve Harris	ea27f9cd17	Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1 ... Conflicts (just history comments): cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java Former-commit-id: 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]] Former-commit-id: c18b96dc4c Former-commit-id: 245afb28c8	2013-03-18 16:43:22 -05:00
Steve Harris	81a3f29afc	13.3.1-8 baseline ... Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]] Former-commit-id: c15b3ffe20 Former-commit-id: 5f492500ea	2013-03-18 15:43:32 -05:00
Dave Hladky	155903d135	Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 ... Conflicts: cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java ncep/com.raytheon.uf.edex.ncep.feature/feature.xml Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227 Former-commit-id: 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]] Former-commit-id: 4b08491880 Former-commit-id: 6ea95002de	2013-03-12 15:48:34 -05:00
Steve Harris	6fe4b16924	13.3.1-6 baseline ... Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]] Former-commit-id: 566b677d09 Former-commit-id: 4ed21b702b	2013-03-12 08:35:45 -05:00
Dustin Johnson	5a8b6459d4	Issue #1543 Use separate RetrievalPlan configurations for NCF and WFO ... - Change new registry modes to explicitly list includes/excludes. - Add separate bandwidth manager creation capabilities for NCF and WFO. - Add deltaScript to add a "route" slot to subscriptions. - Remove unnecessary schemas from Spring files. Change-Id: If3d4d310166bb6a201e191e0480d25829d25bcfa Former-commit-id: d4afef2cab [formerly d8659e742e] [formerly c8760e5699 [formerly 10775068a3e54d8b48b1da4a3e8a6d952ec9c0ee]] Former-commit-id: c8760e5699 Former-commit-id: ca721863be	2013-02-20 10:42:51 -06:00
Brad Gonzales	936facbe86	Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType. ... Amend: Corrected comment in convertPluginNameToDataType.sh Change-Id: I5e0084704cef599d368165058b8008bbb2bc8e18 Former-commit-id: 6a0e9c331b [formerly 03dd42463e] [formerly dfef89ee64 [formerly a2391d76c91d3d2b86b8e74eed1e0754091650a0]] Former-commit-id: dfef89ee64 Former-commit-id: e495a5f663	2013-02-14 17:34:55 -06:00