Commit graph

5691 commits

Author SHA1 Message Date
Dave Hladky
3b00ae03cc Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: a34955102d1316135c4151210daba0e5807ff6c9
2014-04-30 17:38:28 -05:00
Brian Clements
1273846844 Issue #3089 fixed init.d script for collaboration dataserver RPM
Former-commit-id: 9cdef44104a7453a4b968afd1f3845b1ba69ba06
2014-04-30 16:41:14 -05:00
Greg Armendariz
2d38c69ac1 Issue #2571 - Update maps.db snapshot and lake shapefile
Former-commit-id: c223bac540568492253cf70a7c7d7521eda3a62d
2014-04-30 15:42:42 -05:00
Nate Jensen
f005d2f31c Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1
Former-commit-id: aebaae7802e5429eed3ebc39ae9be45568912d8a
2014-04-30 15:16:11 -05:00
Richard Peter
bfe46bb5e6 Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
Former-commit-id: 31d75a4b82413b015353055668defab0095ef893
2014-04-30 14:49:24 -05:00
Ben Steffensmeier
4c06cd6f5e Issue #2946 Fix auxillary purge rules.
Former-commit-id: a62bdff82f96e79737269686598687ecef746c01
2014-04-30 14:38:27 -05:00
Steve Harris
1eb121595d Omaha #3085 - moved com.raytheon.uf.viz.application and com.raytheon.uf.viz.application.feature to core
Former-commit-id: 839a926dca01566419409138e9810f14e0e46b84
2014-04-30 13:59:33 -05:00
Nate Jensen
9b19f95d24 Issue #2060 fix FFG processing
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: 14ce9854abc51b2791b5f93756ae12cbe69b8589
2014-04-30 13:08:26 -05:00
Richard Peter
c8e373c098 Issue #2854: Reorganize deltaScripts
Former-commit-id: 469c2c597b80fd725f474e0d645656e4054fd69a
2014-04-30 13:03:44 -05:00
Brian.Dyke
63137ed69c Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.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.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: 64c3766ed570885a796f846b889d40413e8250c6
2014-04-30 12:57:09 -04:00
Steve Harris
3380a1dba0 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (these moved to ufcore):
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapQueryFactory.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbPointMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DefaultDbMapQuery.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/VizApp.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.uf.viz.ui.menus/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ListSelectionDlg.java
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.dataplugin.maps/src/com/raytheon/uf/common/dataplugin/maps/dataaccess/util/MapsQueryUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/poesDif11u3_7uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u12uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u3_9uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDivWVIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDif11u3_9uIR.py
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDifference.py
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDivWVIR.py
	edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginProperties.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Slice.py
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/DerivedLevelNode.java
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/OrLevelNode.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/ReferencedGeometry.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpace.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpaceMatcher.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/data/AbstractRequestableData.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.common.localization/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/region/RegionLookup.java
	edexOsgi/com.raytheon.uf.common.message/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.message/src/com/raytheon/uf/common/message/WsId.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/JUtilHandler.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SizeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SystemUtil.java
	edexOsgi/com.raytheon.uf.edex.auth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.auth/build.properties
	edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
	edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
	edexOsgi/com.raytheon.uf.edex.core/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/EDEXUtil.java
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/dataplugin/PluginRegistry.java
	edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabaseClassAnnotationFinder.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabasePluginRegistry.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/handler/SharedLockHandler.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginFactory.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/processor/IDatabaseProcessor.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/query/DatabaseQuery.java
	edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/src/com/raytheon/uf/edex/esb/Main.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/StringToFile.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/jms/DedicatedThreadJmsComponent.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/spring/JmsThreadPoolTaskExecutor.java
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-request.xml
	edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-ingest.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java


Former-commit-id: 505635792772e5f261f47fd980f33d371c8dbfcc
2014-04-30 11:22:22 -05:00
Mike Duff
c0b2a19a2f Issue #2860 - Fix to not create empty substitution tags
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff

Former-commit-id: ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1
2014-04-30 10:17:56 -05:00
Richard Peter
9dafb3b9e3 Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1
Former-commit-id: 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0
2014-04-29 16:14:52 -05:00
Steve Harris
af7fb01f53 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.4.1
Conflicts (these are now in ufcore):
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/colormap/ColormappedImage.java
	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
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java


Former-commit-id: a6932cbdbee31973374a6e23c08e0e39a23d99d9
2014-04-29 16:09:07 -05:00
Ben Steffensmeier
60a7f64a5e Issue #3081 Use alias in derived paraemters less.
Former-commit-id: cdbfab27991a9536e48436c084801eb507322e7c
2014-04-29 15:43:08 -05:00
Ben Steffensmeier
5959b17732 Issue #3080 add NaN conversion to Slice.py
Former-commit-id: 084a209f64cf9deb527414500c368ea397b9e3a4
2014-04-29 15:35:29 -05:00
Roger Ferrel
3259d4d44d Issue #3036 Added check for archive's root directories.
Former-commit-id: f344acf3572150c7470ab1e3c3bbb356166c78ff
2014-04-29 14:15:11 -05:00
Brian Clements
a1e416da97 Issue #2906 added close to BUFR parser
close netcdf file to solve NFS clean issue


Former-commit-id: 9675e997369e39455aacadcd72d0d8476f6c7ffc
2014-04-29 13:48:00 -05:00
Brian.Dyke
bdda2e9a7a Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)


Former-commit-id: 9a017e543fc6be9fd0d7b9361bd2226bf2af6211
2014-04-29 12:07:21 -04:00
Richard Peter
32957285fc Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 311c52426b3715d3a73c1fa79a8fd427a4b1b09d
2014-04-28 16:27:40 -05:00
Steve Harris
c4597ec58b Omaha #3085 - moved common.json and viz.datacube to core and org.codehaus.jackson to core-foss
Change-Id: I1ff27e7a023ebaad66cd4a82a2e0fea395c7d3a2

Former-commit-id: ab93e85eb2181446576be5d58062e1c661d4ec98
2014-04-28 16:25:21 -05:00
Lee Venable
e054a7ab98 Issue #3053 - added check for selected items.
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934

Former-commit-id: ca47394d9578aac17d1696bd78c0fbcee5fe3f8f
2014-04-28 15:24:26 -05:00
Steve Harris
a3618cb714 Omaha #3085 - moved common.derivparam.python, common.inventory, common.wxmath to core
Former-commit-id: 786f3c846b23ff201d32f552ed240f1e97acace4
2014-04-28 14:41:41 -05:00
Ben Steffensmeier
f318c9eb62 Issue #2947 ensure consistent interpolation levels for derived satellite.
Former-commit-id: 33d87894c4385cb8f6982c1833f6956fd60d7368
2014-04-28 13:00:39 -05:00
Dave Hladky
82be445e97 Issue #2940 Better error message for bad XMRG config in FFMP
Former-commit-id: dfa3f534b96852975afcd13a6bed653b0f3b8f40
2014-04-28 11:04:35 -05:00
Steve Harris
491b768204 Omaha #3085 - Removed ufcore and ufcore-foss plugins
Former-commit-id: 5dacfcc17cf99c604c0d4d2669c0aab962eca3ca
2014-04-28 09:59:23 -05:00
Nate Jensen
dc3ba942a9 Merge "Issue #2972 fix thin client startup" into development
Former-commit-id: 8cb26c62f4ea421f3ab769561ae62a646cad2f4a
2014-04-25 15:05:07 -05:00
Richard Peter
b06172a798 Merge "Issue #3000 fix common.dataplugin.bufrmos manifest" into development
Former-commit-id: d338c2ad7562c6c86915c9e95d2aeca35d401586
2014-04-25 14:57:51 -05:00
Nate Jensen
9a46583271 Merge "Issue #2629: Update capture to grab Xorg log files." into development
Former-commit-id: 4dc1938de1bd30ac5223a1c0a6748139454ddc2e
2014-04-25 14:57:47 -05:00
Richard Peter
6918dc0026 Issue #2726: Make SmartInit shutdown more gracefully
Change-Id: I1a5514e75645083a1d8fa8a771ac33ea8fd39fe7

Former-commit-id: 93f8af097d2a04e054e1c3d0ae0b7d62ca30892e
2014-04-25 14:53:22 -05:00
Nate Jensen
ca2cc7f11d Issue #3000 fix common.dataplugin.bufrmos manifest
Change-Id: I4f414ad2cc3d147badb0196a03ba152c9a74dccf

Former-commit-id: c91c2477aeff207ff253bce22b4fea57a7172d5c
2014-04-25 14:51:45 -05:00
Richard Peter
1cc7977b99 Issue #2629: Update capture to grab Xorg log files.
Change-Id: Ic6d4806bee75894805fb7fa5882d3b454418c26d

Former-commit-id: 38ad09697f3e618b6c9edb6592913b2d50014d14
2014-04-25 14:42:53 -05:00
Nate Jensen
86e9502341 Issue #2972 fix thin client startup
Change-Id: I000da2e3dc289d1441f9df452a9f3e5f39fce5b4

Former-commit-id: 0b72fe025d46b92c125a1e36651b966bf9f00481
2014-04-25 14:42:07 -05:00
Ben Steffensmeier
fa3d4bb618 Issue #2874 Allow RTOFS nowcast to be identified by process type.
Former-commit-id: 1e430dd1227f2e368a7da21d116677a3b522d5ed
2014-04-25 14:38:36 -05:00
Brian Clements
f1213c1bda Issue #3070 fixed contact request logic when adding to group
Former-commit-id: 57120491452b36bf15227bd4b6d0236221c71124
2014-04-25 13:41:17 -05:00
Nate Jensen
0a245df4f1 Merge "Issue #2060 remove FFG post processor dependency on dataURI, other minor cleanups" into development
Former-commit-id: 5b4555f7e94bf952b6e2323685e53e4708a8039b
2014-04-25 13:26:10 -05:00
Richard Peter
5c0f9b5ba5 Issue #2995: Update DB Class Finder to search all plugin jars
Change-Id: I42b5207372aa9d6f07afff0d18819c60b85fb3f8

Former-commit-id: f3fe2db624f7f9e6c7b0b65d600ddba5e42de361
2014-04-25 13:07:59 -05:00
David Gillingham
f32cf61f22 Merge "Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE." into development
Former-commit-id: e18ad8fe1c14c098e33ef98e3eaeb319bc2d1b1a
2014-04-25 12:24:52 -05:00
Nate Jensen
74b3181107 Issue #2060 remove FFG post processor dependency on dataURI, other minor
cleanups

Change-Id: I4c572c3f7d2bef1bdd0b9a596f916e29f8e53410

Former-commit-id: b45cdd1a3f4742937b9085ca70d538ae724d6aab
2014-04-25 12:19:23 -05:00
Brian Clements
98adf15cda Issue #3079 update to lightning name will continue if it encounters invalid xml
Former-commit-id: 07e7a0eaa6973a705d5fff1beb8ebcb553c172d0
2014-04-25 11:04:00 -05:00
David Gillingham
6ca193b8e9 Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb

Former-commit-id: 33197dc6708b65e85233b51be1e99e6411ece60f
2014-04-25 10:56:43 -05:00
Brian.Dyke
3524838f9f Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: f54d2c639a915db14f01f56a7fcc5841b60e1509
2014-04-25 11:06:11 -04:00
Richard Peter
225d95171c Merge "Issue #2726: Add hooks to stop archiving processes during shutdown." into development
Former-commit-id: 98e0a18741b559dff887db980d95965edf5f7cae
2014-04-24 19:15:56 -05:00
Richard Peter
9a7e1aa9b0 Issue #2726: Add hooks to stop archiving processes during shutdown.
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a

Former-commit-id: 75ec73e02885fe0f646bc8961f3ea876597abab9
2014-04-24 19:11:50 -05:00
Nate Jensen
9cea7f88fb Merge "Issue #2060 remove dependency on grid dataURI column from more of DAT" into development
Former-commit-id: c73204189b318fd3aed128535166f72c99739dba
2014-04-24 18:20:27 -05:00
Lee Venable
e7acb04432 Merge "Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs." into development
Former-commit-id: 9762326cea40526042cd7f371d864a96abd63842
2014-04-24 17:53:05 -05:00
Lee Venable
9642dac1f1 Merge "Issue #3045 Change column label to "Data Set"." into development
Former-commit-id: cd77697623d93188b703d2813cbda8af53dbebc7
2014-04-24 17:42:12 -05:00
Roger Ferrel
cf6d1c8ca1 Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13

Former-commit-id: f00ce42d8e79ef47d9b14125dc61129fc60fc0cf
2014-04-24 16:25:01 -05:00
Brian Clements
94aa761e19 Issue #3070 fixed contact request handling
no longer get empty group if user denies contact request
fixed UI update issue when server removes from your roster
added icon for pending contact request
fixed auto accept reply from users you initiated contact request with


Former-commit-id: 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096
2014-04-24 16:10:27 -05:00
Richard Peter
a21a2bafe1 Merge "Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data." into development
Former-commit-id: 45f01ee4e8bc0597c1fe55e1dbde7223f3dcc30d
2014-04-24 15:43:15 -05:00