Roger Ferrel
|
49c1d502db
|
Omaha #3252 Fix bug in __makeHader to prevent unexpected exception.
Former-commit-id: a961faca0d [formerly 09ae36d8de] [formerly 960772ea44] [formerly a961faca0d [formerly 09ae36d8de] [formerly 960772ea44] [formerly 42fe1bf5b2 [formerly 960772ea44 [formerly 787261f13c47b5de81b2e7c4f861645614a11f1f]]]]
Former-commit-id: 42fe1bf5b2
Former-commit-id: 8071e5f75f [formerly c43758bdbb] [formerly 1b61807ee6ec798bcfcc7b443f172268d2f0bc0a [formerly 95d7540d05]]
Former-commit-id: 19e5b0b0324c00092520c790507df047e0ba4947 [formerly 5e9ed74eac]
Former-commit-id: 06808134bf
|
2014-06-12 10:08:51 -05:00 |
|
Roger Ferrel
|
941e79020b
|
Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data.
Change-Id: Ide97fbfd93bf06a6d708bf6fbd74349000ba2ed5
Former-commit-id: cb5070f384 [formerly 7510cc23af] [formerly e1c011b157] [formerly cb5070f384 [formerly 7510cc23af] [formerly e1c011b157] [formerly 10e7a33f08 [formerly e1c011b157 [formerly 3e976b7ed5cf46687bbb76073e53f35ffc2c2812]]]]
Former-commit-id: 10e7a33f08
Former-commit-id: 48dd32b752 [formerly e799ce4c59] [formerly e5bd21828e3c3092ef9dcb90f6991be60f99b48d [formerly aa085d9e59]]
Former-commit-id: 9eefab3c342160e3dcf89f23c7d7c9b414c299b8 [formerly 050c2e87e7]
Former-commit-id: b575bb7de2
|
2014-06-04 08:14:06 -05:00 |
|
brian.dyke
|
5c9495ee04
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]]
Former-commit-id: 58683ad040
Former-commit-id: a2add51880 [formerly 2e105c1d5d] [formerly cba44a8343721392c8a010e859fb1efaca4b604b [formerly bc4649765a]]
Former-commit-id: 161c7365002f1434a02f072bc8ba71aba3cbf346 [formerly b42011fc76]
Former-commit-id: b2e3c50ec0
|
2014-05-19 09:45:37 -04:00 |
|
Zhidong.Hao
|
36267a0e9a
|
ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: e8abed29cb [formerly 29e7d7e888] [formerly 8d560036b1] [formerly e8abed29cb [formerly 29e7d7e888] [formerly 8d560036b1] [formerly 074713bb4a [formerly 8d560036b1 [formerly 62f8c0ab0e046fd4365bd37394f93e8bca4e642d]]]]
Former-commit-id: 074713bb4a
Former-commit-id: 6f2039bc59 [formerly f03c0c46d5] [formerly 025b97a94ef4343ad6ec6a2dbf9893ebc3ddd8a2 [formerly 51680a6d04]]
Former-commit-id: 8e1fe73a0716e63e0e1f9f82e747fb8ff4e93c6d [formerly b1c20f92c1]
Former-commit-id: f06165d783
|
2014-05-12 14:33:25 -04:00 |
|
Richard Peter
|
e748b7c1e5
|
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: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
19b4bb7dcc
|
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 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1 [formerly bf3758efa3] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952]
Former-commit-id: f31d8cc8cf
|
2014-04-25 11:06:11 -04:00 |
|
Ron Anderson
|
997390456d
|
Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour.
Fixed Wx parsing for AvnFPS
Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73
Former-commit-id: bf6d35aa0f [formerly 2f68fb8f2c] [formerly 221a06e467] [formerly bf6d35aa0f [formerly 2f68fb8f2c] [formerly 221a06e467] [formerly f3185dd206 [formerly 221a06e467 [formerly e636563052042d2dbfab6a4e476b71004b28c165]]]]
Former-commit-id: f3185dd206
Former-commit-id: 569608769f [formerly 00f2f374cd] [formerly 373f6b66bdafbfe9284322be7df3257cc614b264 [formerly 3e37419dc6]]
Former-commit-id: 8be9012562513da025e5171ffb93c9c520d7ee60 [formerly 78ef1d5c4c]
Former-commit-id: dd5c3bf2fd
|
2014-04-23 17:04:16 -05:00 |
|
Brian.Dyke
|
143d9a143a
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly b8829139a2 [formerly 12a482e1d7 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]]
Former-commit-id: b8829139a2
Former-commit-id: 9c4385efbe [formerly 6f35818917] [formerly 007cb5daf20362de356dbfbefce51ee972d9ab3a [formerly 0ea7c51ad7]]
Former-commit-id: 286e1b30c773c91540e1e54ed0825014dadb3b10 [formerly a925ba6219]
Former-commit-id: de500c093f
|
2014-04-17 14:42:35 -04:00 |
|
Richard Peter
|
626ab0bd58
|
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
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
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 56089894f2 [formerly d65b11d404] [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]]
Former-commit-id: ea5917ddde80aa4f2fa095272512ef873794f21c [formerly b6482f2e54]
Former-commit-id: a22345ea6b
|
2014-04-11 16:23:09 -05:00 |
|
Richard Peter
|
52a54f5e9f
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: 47795836f2 [formerly f1b85f6964] [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]]
Former-commit-id: 3660d57b987b8ab590b095e98b193f3d1ff95669 [formerly b667e0509f]
Former-commit-id: 421b2716a4
|
2014-04-09 16:00:54 -05:00 |
|
Lee Venable
|
d08f39f428
|
Issue #2925 - Fixed NPE found during testing.
Former-commit-id: a700d23f6d [formerly cc7d240cfd] [formerly c29981fa99] [formerly a700d23f6d [formerly cc7d240cfd] [formerly c29981fa99] [formerly 5b73c516d3 [formerly c29981fa99 [formerly 86306076f94bbfe4e063c4e6d82b7140b5911e61]]]]
Former-commit-id: 5b73c516d3
Former-commit-id: 1fb169f1ce [formerly 05a4c4e31b] [formerly 0052d9d30c35dc39dd69aece42fc59a0f471c58f [formerly f08d4a827f]]
Former-commit-id: 275c2d56eebfcd30f92e3347955172f87a580714 [formerly 2384cc90c0]
Former-commit-id: f160e66a85
|
2014-03-21 12:42:13 -05:00 |
|
brian.dyke
|
4744c64069
|
merge 14.2.1-3 into asm-14.2.2
Former-commit-id: becf6322c6 [formerly 4a62e83835] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 2294c81a57]] [formerly becf6322c6 [formerly 4a62e83835] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 2294c81a57]] [formerly f10f6d4e8a [formerly 2294c81a57 [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: ac37e2ea2e [formerly 621464ac0d] [formerly 83bf7b38976fc3a19f898b0fe2c8e7790a8d7629 [formerly e9e2eb3be0]]
Former-commit-id: ee40d762efff70a1679bc3c2641d377b51facc3b [formerly dcf5f25ed1]
Former-commit-id: ca9263003a
|
2014-01-27 15:27:49 -05:00 |
|
Max Schenkelberg
|
3c02342d04
|
Issue #2033 moved avnfps and text workstation files into respective plugins.
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2
Former-commit-id: db24201469 [formerly bbad83c21a] [formerly 6f60751ec6] [formerly db24201469 [formerly bbad83c21a] [formerly 6f60751ec6] [formerly c5575f9624 [formerly 6f60751ec6 [formerly 77e1a4d8f5237e5fae930c1e00589c752f8b3738]]]]
Former-commit-id: c5575f9624
Former-commit-id: 62f4f1bafb [formerly 8139e0dfb7] [formerly 33159773a1764cd4fb517d13a3cff0a11feaa433 [formerly 8de539020d]]
Former-commit-id: 094fceec6e1d9989f5e80a4efe1310f8a093b3ef [formerly 451eb54a36]
Former-commit-id: f553c93092
|
2013-08-15 12:21:43 -05:00 |
|