Commit graph

638 commits

Author SHA1 Message Date
David Lovely
240927c241 Omaha #3957 Moved QPID to build repository directory structure.
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084

Former-commit-id: f27b0c6b92b4c744493e44b510defe3d650ca1f6
2015-01-07 12:03:10 -06:00
Richard Peter
2457d0e6f7 Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
2014-12-12 10:36:04 -06:00
Bryan Kowal
aad5e554b9 Omaha #3914 - increment yajsw release
Former-commit-id: 9a3e3a2cfdc29926e2d08c7a8e33d45f9ce5f22a
2014-12-10 10:34:26 -06:00
Bryan Kowal
9e55db1c52 Omaha #3508 - remove references to yajsw in %files
Former-commit-id: 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9
2014-12-05 10:04:42 -06:00
Bryan Kowal
19f6551c88 Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
Former-commit-id: f6a3317e329728080f8efe8db545e3324161986e
2014-12-05 09:20:23 -06:00
Greg Armendariz
8803a6b658 Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1
Former-commit-id: 58b7cbad88b75985e8a0d6bd4c2db72b5ce28d23
2014-12-05 08:57:37 -06:00
Greg Armendariz
83ca3b5381 Merge "Omaha #3508 - created the yajsw rpm" into omaha_14.4.1
Former-commit-id: f310e13350ba8e64e313d99a7d03d0ef3cdc6aba
2014-12-05 08:57:08 -06:00
Bryan Kowal
71cf313666 Omaha #3508 - purge non-centralized yajsw distributions
amend: ensure edex is dependent on yajsw

Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55

Former-commit-id: 9b36754ca610887a17666ceff2a1540b958913b6
2014-12-04 17:33:43 -06:00
Bryan Kowal
8be5362dbd Omaha #3508 - created the yajsw rpm
Former-commit-id: 6bd0c60b4c5ba3ff6b424cac04c42728594b4c21
2014-12-04 16:26:55 -06:00
Fay.Liang
83a4987188 Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 1fcac564095b86cd4c6103a6484b25bbff2339b2
2014-12-04 13:46:31 -05:00
Greg Armendariz
6dd90bb25a Omaha #3216 - update postgres to use geos 3.4.2
Change-Id: If1b56c95e32cbbe4c78c8dfb956fdff8ecb8aa2b

Former-commit-id: 453247c7731adb5e1ca4e58306d14715c0f3a350
2014-12-04 11:34:45 -06:00
Greg Armendariz
7ac9281ba6 Omaha #3216 - Increment pypies release number
Former-commit-id: 0497a64f539e716089736597385ff9ff3d18e5c0
2014-12-02 14:45:04 -06:00
Bryan Kowal
eb52d1b333 Omaha #3695 - PostgreSQL will always provide version 3.3.6 of geos. Version 3.3.6
of geos is the only version that our current version of postgis will see. Even
when geos 3.3.7 and 3.3.6 are on the path during compilation, postgis will still
be compiled with a dynamic link to both versions of the library even though
there was not a 3.3.6 available during compilation.


Former-commit-id: 2dafcfc4e0350654c30eb077329711259bf12d1f
2014-11-24 16:20:34 -06:00
Fay.Liang
99263f79e1 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9
2014-11-20 13:32:25 -05:00
Shawn Hooper
b7369c5eef VLab Issue #5395 - Build fixes and gfeConfig.py update
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: 94093accc4b2adc4c12cea0a3af0e037c1be52d8
2014-11-20 13:12:16 -05:00
Fay.Liang
29561d5324 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 28c3dbd91c1e89ffffd19afa811a08e228a995dd
2014-11-19 22:07:54 -05:00
Shawn Hooper
50cd8ace64 VLab Issue #5375 - Update spec file for VADATUMS tar file.
Change-Id: Id4cb17192ca46af4dc731ebae260c9a8a3acfd13

Former-commit-id: 83e81ee0af2d612f08f32e760e9f4d00ee1dd7aa
2014-11-19 14:08:27 -05:00
Greg Armendariz
ad5e3134e4 Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build
Change-Id: Iedaba76caf3b690d31012dff00f91f3cd5e81e8b

Former-commit-id: 0d4e39f166c8e8607d0a3c3f43f3656531e62e1e
2014-11-18 13:48:19 -06:00
David Lovely
e0525f7816 Omaha #2991 Fixed REST URL in Python scripts, Added checks to broker build commands to fail if they didnt work.
Change-Id: I9bc88caa14d08861eb4dd4628b729bedc8500325

Former-commit-id: 89acb99f0639f34e4ba3530e49c81ce5dda42785
2014-11-13 10:59:00 -06:00
David Lovely
625e83c445 Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30.
Change-Id: Ib28bf8e2edb3b299a7122bac7c80f302780b7470

Former-commit-id: 3addb3007b0bf7aab88b423bbf700583fc2b3e48
2014-11-10 08:27:28 -06:00
Steve Harris
a5398d8035 Merge tag 'OB_14.3.1-31m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java

Former-commit-id: 361f7bcf425edaf687cbfc63d4c165790b45a5bf
2014-11-04 13:17:44 -06:00
Shawn.Hooper
285e4baaec ASM #16805 - Increment release number in the awips2-tools rpm spec file
Change-Id: I5ab390facd2343fdcbc9d2f374d275d9ef466aa4

Former-commit-id: 80801f18a7106c3a7b0dca626fbaca4ec5a67f7f
2014-10-30 09:58:02 -04:00
Steve Harris
1b83d045ea Merge tag 'OB_14.3.1-28m' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
	rpms/awips2.core/Installer.gfe.climo/component.spec

Former-commit-id: 353674cd0deec2dd86c38dc75c7593d1477a7e78
2014-10-28 13:32:31 -05:00
David Lovely
2f9c1e8303 Omaha #2991 Initial add of qpid 0.28. Fixed an issue with the x86_64 directory not being created.
Change-Id: Iacd5c7d8b41ab3100b7ea9c409ec18691ffe7fdc

Former-commit-id: b50c56c84968f4765245ec12fa33c3037b0380ff
2014-10-23 15:55:26 -05:00
Shawn.Hooper
0e372cd13e ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868

Former-commit-id: e29cf5a57591e5a25b6e73b267c0abb46e9f95c2
2014-10-22 14:47:42 -04:00
Steve Harris
dc557b2d0c Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml

Former-commit-id: ea787b645974850607658e5a7dfc4a072d831a3b
2014-10-22 11:45:39 -05:00
Shawn.Hooper
d0fba5965b ASM #16805 - Fix rpms/legal/ directory
Change-Id: I369e4d5423c760bf689180239f15cfd363a202b3

Former-commit-id: 94872b496bec6c427030ea353856466809d2e6c1
2014-10-21 11:17:45 -04:00
Shawn.Hooper
e24cb3c37e ASM #16805 - Update master rights and license files for 14.3.1.
Change-Id: Ifb5b67010a01dfa9805e64d408f5688d10d7bf82

Former-commit-id: f72ec046e98bdb6734dbce10ef472dd5294c59ba
2014-10-20 14:36:31 -04:00
Brian.Dyke
418894a17b Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: f0f79fb324665245ef759947d24514a6c8bc4470
2014-10-16 12:04:27 -04:00
Sean.Webb
36d39be5fd ASM #16827 - Added 6th channel configuration, and change logrotate to handle goes_add.log
Change-Id: I2012ac01d51ed11c077d06b638ede4b990bce5cd

Former-commit-id: c11e78b57bca7d242d4d8c29dc51669d7aebb37d
2014-10-16 10:38:14 -05:00
Ana Rivera
f516cc441d VLab Issue #5014; Workaround pqact pattern for ESTOFS (RM 295); fixes #5014
Change-Id: I77529f91b0d6b59640bda21be909f84fdc049614

Former-commit-id: 721938a9fd9a270a2b886eb19de6df70fd62555d
2014-10-15 18:41:58 +00:00
Steve Harris
da463c484e Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml

        Issue #3648:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

        Issue #3560:
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
        Also modified with the resolution of #3560:
        edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java


Former-commit-id: 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd
2014-10-03 10:18:34 -05:00
Ron Anderson
ec1530c5e8 Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm
Change-Id: I2972686a3467d59701cf26bf18273027e5fad4e8

Former-commit-id: 5db9a6f87fa658f6bc7fdfabdae5b785a7f33e59
2014-09-30 14:09:31 -05:00
dmsys
8c3625cfec Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm

Former-commit-id: 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c
2014-09-30 13:45:54 -04:00
Steve Harris
90e08b96e1 Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py

Former-commit-id: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
2014-09-29 12:58:56 -05:00
Brian.Dyke
0c1b83b644 Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 6e79993fbf34ebd832ca07356cbac003efaf6405
2014-09-29 11:55:16 -04:00
Ben Steffensmeier
f92d021e96 Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 00d314b6b493bc34ccd77f731307b5039e22d844
2014-09-29 10:49:14 -05:00
Brian.Dyke
0a497fc015 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 01cb1dc674ae1249d97dc10be5c068de0ed2a222
2014-09-29 11:20:57 -04:00
Sean.Webb
02e187a609 ASM #16720 - Added pushd and cd prior to patch extraction
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225

Former-commit-id: c2af0284e9146dff8431ecd4f6ce88437ea83d9f
2014-09-29 10:24:04 -04:00
Sean.Webb
0738a41cbf ASM #16720 - Removed extraneous popd which was changing dir when not needed
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683

Former-commit-id: 4faea9724adf17d0bec7f013bafc7f8dd2f7499e
2014-09-29 08:21:00 -04:00
Sean.Webb
628ab54d68 ASM #16720 - Added updated palt.c to fix seq num in pqact pattern
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5

Former-commit-id: d59054c870fee17076aec22cd683ef1586a153da
2014-09-26 10:49:37 -04:00
Brian.Dyke
4b418918d4 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml

Former-commit-id: e04ad21771ce410beb25e15fe300a34796a1a062
2014-09-24 11:05:37 -04:00
Sean.Webb
00479a436d ASM #16761 - Fixed typo on variable character
Change-Id: Iaab6df0c74bd1745d81717590d9980e1057ece37

Former-commit-id: 97a94d4b1d612ca0878defd3e3fcf2b7391e3b36
2014-09-22 14:10:28 -04:00
Sean.Webb
47aef24f6f ASM #16761 - Fixed typo on variable character
Change-Id: Ibb44f6b6f969a92780d28676db930420bc7446c2

Former-commit-id: 721bead655f9a384ea12444617774b7ef404feb0
2014-09-22 07:18:21 -04:00
Sean.Webb
4368f4650b ASM #16761 - Fixed typo on variable character
Change-Id: Ia37804afe2f77e17dd76fcc52b3a7ad4870e5275

Former-commit-id: 5c541f50dcc68a856e8c81bff8577334abf1ff75
2014-09-19 13:43:45 -04:00
Steve Harris
091555cf10 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce
2014-09-19 10:28:57 -05:00
Sean.Webb
b0b01694f7 ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b

Former-commit-id: 031c41d4f7801c8a5127cf007358856bf771593a
2014-09-19 09:29:31 -04:00
Sean.Webb
5c84cadaf6 ASM #16761 - Added retrans code updates from ISG
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c

Former-commit-id: 165b9a9b3481b3fa1d31b771eead03180430be59
2014-09-19 07:25:18 -04:00
Sean.Webb
35bfd8269c ASM #16761 - Updated ldm spec to add retrans
Change-Id: Ie9e2ab553410ef7d16c023d7af2178169c604229

Former-commit-id: bb9d431a842511b0081660224f3ddefd947f76fd
2014-09-18 09:33:47 -04:00
Stephen Gilbert
5bf2ed644a Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3
2014-09-15 13:20:34 -04:00