Brian.Dyke
|
14a63a19e1
|
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: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]
Former-commit-id: bf3758efa3
|
2014-04-25 11:06:11 -04:00 |
|
Nate Jensen
|
17544a32ba
|
Issue #3039 fix ifpImage class cast exception
Former-commit-id: 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 31fb61e824 [formerly 2b6db445c0 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]
Former-commit-id: 31fb61e824
Former-commit-id: ab6962b9080189e0cbac802398d99762ae5982e2 [formerly a1dd7f24fa]
Former-commit-id: 19f0be6afc
|
2014-04-16 16:17:05 -05:00 |
|
Ron Anderson
|
ec74556c48
|
Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
Change-Id: Ic01c265f792d855751aeac9890953600d531c12c
Former-commit-id: ee8d561f81 [formerly 7e58a73dbf] [formerly 8da64048e7] [formerly 69cd6a1598 [formerly 8da64048e7 [formerly cfec08f8c4ac8552699e9387148ba2e9d0dc9558]]]
Former-commit-id: 69cd6a1598
Former-commit-id: ef0141d58da5e73da45520afce6c1175f7c71496 [formerly dde9253f15]
Former-commit-id: b16405ecb3
|
2014-04-02 18:22:51 -05:00 |
|
Nate Jensen
|
dced4c4d11
|
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: a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]
Former-commit-id: 6880a18f1a
Former-commit-id: df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e]
Former-commit-id: 19043faeaa
|
2013-10-29 14:33:53 -05:00 |
|
David Gillingham
|
045491313b
|
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: 4e435000f4 [formerly ee4ba98a26] [formerly b8c1bc39f6] [formerly 64cde568ab [formerly b8c1bc39f6 [formerly cdb1ad6eee96d2b61d35d7d5d727336128827a1b]]]
Former-commit-id: 64cde568ab
Former-commit-id: 1b90a2df9873e55a268e580ba1f09800d20b2e83 [formerly e311062ae2]
Former-commit-id: 04f2c165da
|
2013-09-16 12:50:04 -05:00 |
|