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
Nate Jensen
31fb61e824
Issue #3039 fix ifpImage class cast exception
...
Former-commit-id: a2fd849c603aebacce09662557bf1f008d379982
2014-04-16 16:17:05 -05:00
Ron Anderson
69cd6a1598
Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
...
Change-Id: Ic01c265f792d855751aeac9890953600d531c12c
Former-commit-id: cfec08f8c4ac8552699e9387148ba2e9d0dc9558
2014-04-02 18:22:51 -05:00
Nate Jensen
6880a18f1a
Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
...
Former-commit-id: 0c24c900ce938982306bad9307f3b1ef27b362bb
2013-10-29 14:33:53 -05:00
David Gillingham
64cde568ab
Issue #2033 : Move GFE-specific localization files and other misc. code out of
...
build.cave project and into viz.gfe project.
Change-Id: Ic51275064f92a9cf50a15c2fff647b73f0839375
Former-commit-id: cdb1ad6eee96d2b61d35d7d5d727336128827a1b
2013-09-16 12:50:04 -05:00
