David Gillingham
|
ca1e1d19cb
|
Omaha #3157: Refactor TPCWatchSrv, SPCWatchSrv, and WCLWatchSrv to correctly handle multiple active GFE sites. Update active table code to allow multiple configured SPC and TPC sites from VTECPartners.py.
Change-Id: Ie7565f0932054477580baf7e06e26357916fd746
Former-commit-id: 137dbb9783 [formerly 04557f3854 ] [formerly 137dbb9783 [formerly 04557f3854 ] [formerly 1f1db083ca [formerly 9185eea7409452fe004185dfa51d78f5adb656d4]]]
Former-commit-id: 1f1db083ca
Former-commit-id: 76496a18cb [formerly 0de24e8a44 ]
Former-commit-id: 06d487fd52
|
2014-05-19 12:50:10 -05:00 |
|
Richard Peter
|
f56a989679
|
Issue #2726: Fix route start up order race condition
Change-Id: I3461f3e7c79ba099eb6c3eafa5b0345aa0fbf585
Former-commit-id: 74f1c41e68 [formerly 17b07813ba ] [formerly 74f1c41e68 [formerly 17b07813ba ] [formerly 974303044a [formerly 802f537f26d88d43811df7c97382f6082f79a391]]]
Former-commit-id: 974303044a
Former-commit-id: 696cf7e8c6 [formerly 8d3e897cb5 ]
Former-commit-id: 77b7ad1a7e
|
2014-05-19 12:43:56 -05:00 |
|
Richard Peter
|
2244c1ef03
|
Omaha #2782: Fix DD logging.
Change-Id: Id377941213f50ab2ea6f0c1e72a64579d126b168
Former-commit-id: 7fb6487460 [formerly 685ba4c0c5 ] [formerly 7fb6487460 [formerly 685ba4c0c5 ] [formerly b7e630bda7 [formerly b257c36bf2203e00e1f615a345b942987edfcf7a]]]
Former-commit-id: b7e630bda7
Former-commit-id: 0bdf468942 [formerly 209e076385 ]
Former-commit-id: 2bdb31d097
|
2014-05-19 12:41:09 -05:00 |
|
Shawn Hooper
|
9edb54c13a
|
Merge "Revert "ASM #512 - Need radar data watchdog functionality"" into asm_14.3.1
Former-commit-id: 476c78a2d7 [formerly 189e3cc1f2 ] [formerly 476c78a2d7 [formerly 189e3cc1f2 ] [formerly 342398e6a3 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]]
Former-commit-id: 342398e6a3
Former-commit-id: 32ca0c8d1c [formerly 5a8f0dbd69 ]
Former-commit-id: 3ea1e218e7
|
2014-05-19 12:18:46 -05:00 |
|
Richard Peter
|
8a71079141
|
Merge "Omaha #2536 merged uf.edex.textdbsrv into text plugins" into omaha_14.4.1
Former-commit-id: 1e9c2b27b6 [formerly 0f9015e824 ] [formerly 1e9c2b27b6 [formerly 0f9015e824 ] [formerly 0480bfa478 [formerly 4ca4b10fe7331282d32f0a21549f5e6eadc7e16c]]]
Former-commit-id: 0480bfa478
Former-commit-id: f3e7d16402 [formerly 802a043085 ]
Former-commit-id: fa926cd515
|
2014-05-19 12:12:05 -05:00 |
|
Shawn Hooper
|
06f37867ea
|
Revert "ASM #512 - Need radar data watchdog functionality"
This reverts commit e4559309601c5d4a3096c42cd56f1d3167c0fd0e [formerly 7e036b2bbc ] [formerly 0c8c5ef728 [formerly 9988804887 ] [formerly 0c8c5ef728 [formerly 9988804887 ] [formerly 7e036b2bbc [formerly ad727f0b3d820cf2310b4b8cc67639b6d141af6b]]]].
Change-Id: I730af948f1d0cfcf2167524ea934ffc8a57ece87
Former-commit-id: 28660769ec [formerly 4a4ca91f69 ] [formerly 28660769ec [formerly 4a4ca91f69 ] [formerly 20541c39ca [formerly 75d287edfc717bb0d085a9723c417edbce035237]]]
Former-commit-id: 20541c39ca
Former-commit-id: 00df339111 [formerly beb73c09f3 ]
Former-commit-id: e6e4ba572d
|
2014-05-19 11:27:43 -05:00 |
|
Brian Clements
|
de232ae55c
|
Omaha #2536 merged uf.edex.textdbsrv into text plugins
split into uf.common.dataplugin.text and uf.edex.plugin.text
Former-commit-id: 4d40a98ad7 [formerly a06d332ff4 ] [formerly 4d40a98ad7 [formerly a06d332ff4 ] [formerly 2f5cffbe15 [formerly 5f238c51d856984808dee0d2ba62b6a8fbdbd6a1]]]
Former-commit-id: 2f5cffbe15
Former-commit-id: 7761b74112 [formerly 8ddae2fc54 ]
Former-commit-id: f61d1ac976
|
2014-05-19 10:53:37 -05:00 |
|
brian.dyke
|
b2e3c50ec0
|
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: 9626317825 [formerly 011d121e4b ] [formerly 9626317825 [formerly 011d121e4b ] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]
Former-commit-id: 58683ad040
Former-commit-id: 2e105c1d5d [formerly bc4649765a ]
Former-commit-id: b42011fc76
|
2014-05-19 09:45:37 -04:00 |
|
Brian.Dyke
|
529febf986
|
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
Former-commit-id: c2afc26206 [formerly 3183283e99 ] [formerly c2afc26206 [formerly 3183283e99 ] [formerly dcd238c6a3 [formerly 18486e2e8ead4614c05e3a7775cba95cd78053c8]]]
Former-commit-id: dcd238c6a3
Former-commit-id: 4a37cd32bd [formerly 353aebe447 ]
Former-commit-id: 3b7e8c2c66
|
2014-05-16 08:45:47 -04:00 |
|
Nate Jensen
|
126af61500
|
Omaha #3133 attempt to fix build
Change-Id: Ib6668229987cb136c16fb57128becb1624e0b212
Former-commit-id: 7cfbc3d06c [formerly 6240667b0f ] [formerly 7cfbc3d06c [formerly 6240667b0f ] [formerly 11c580549a [formerly 661a24eafe2374970982a137146c77d9ec1a1406]]]
Former-commit-id: 11c580549a
Former-commit-id: d0fc6945fd [formerly 94c289f944 ]
Former-commit-id: cedb413487
|
2014-05-15 17:02:27 -05:00 |
|
Nate Jensen
|
8f809c9996
|
Merge "Omaha #2536 fix TAF period clone issue" into omaha_14.4.1
Former-commit-id: 1954b5563c [formerly 3f123f16c8 ] [formerly 1954b5563c [formerly 3f123f16c8 ] [formerly 093e77d30b [formerly 73ea1df289595c7a54995f8af2014600ad573ed5]]]
Former-commit-id: 093e77d30b
Former-commit-id: 21cfa56f0c [formerly 9be5b1cf80 ]
Former-commit-id: 4ab098cdc9
|
2014-05-15 16:25:45 -05:00 |
|
Stephen Gilbert
|
47658e4f9b
|
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
Table updates for GRIB decoding; Updates to gpd, mcidas, pafm, and pgen
plugins
Change-Id: Ic6874210998d7f5a6b164ef45c6918246388ee68
Former-commit-id: 4602f86f47 [formerly bd2dad11b5 ] [formerly 4602f86f47 [formerly bd2dad11b5 ] [formerly ca9b7c8dfc [formerly 3c904361e7176592cc873a3414c18ad5107aea54]]]
Former-commit-id: ca9b7c8dfc
Former-commit-id: da02372ba6 [formerly 4e5968d7b6 ]
Former-commit-id: 7730224fe9
|
2014-05-15 17:20:52 -04:00 |
|
Brian.Dyke
|
43210259de
|
Merge remote-tracking branch 'remotes/origin/master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-5 into 14.2.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.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/gfe/isc/iscMosaic.py
Former-commit-id: 2de7de6378 [formerly b066572041 ] [formerly 2de7de6378 [formerly b066572041 ] [formerly c8f21e92fe [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]]
Former-commit-id: c8f21e92fe
Former-commit-id: 7cc4e0258d [formerly 984f56d23c ]
Former-commit-id: 17d7291548
|
2014-05-15 16:40:47 -04:00 |
|
Brian Clements
|
27e91ec4f3
|
Omaha #2536 fix TAF period clone issue
taf period values may be null, copy must account for that
Former-commit-id: acb4515f36 [formerly 6587ea9f4c ] [formerly acb4515f36 [formerly 6587ea9f4c ] [formerly 2a362cd0e1 [formerly 51fec9906d4221595995c4b54a6affad420f6739]]]
Former-commit-id: 2a362cd0e1
Former-commit-id: c5a58d9c86 [formerly 3055830ae1 ]
Former-commit-id: 7d00def606
|
2014-05-15 15:17:33 -05:00 |
|
Nate Jensen
|
5413e9f0ba
|
Merge "Omaha #3133 remove unused dependencies" into omaha_14.4.1
Former-commit-id: 8dc3c2acb5 [formerly 2de3dbb7d9 ] [formerly 8dc3c2acb5 [formerly 2de3dbb7d9 ] [formerly d9e395e51c [formerly 1a5726e02d1457252b53ac740f5bc556ecc940fa]]]
Former-commit-id: d9e395e51c
Former-commit-id: 26a15e78c4 [formerly f37041b6e1 ]
Former-commit-id: 6809d6ac78
|
2014-05-15 15:03:40 -05:00 |
|
Nate Jensen
|
f0b89d994f
|
Omaha #3133 remove unused dependencies
Change-Id: I9a0ac7d0b15f266ea8818ac0db82067887e59ec6
Former-commit-id: 63b925e17e [formerly 3db92e6c0b ] [formerly 63b925e17e [formerly 3db92e6c0b ] [formerly 1ae82b82db [formerly 5a00869db4e7467e49e9a632150a8135ea32b569]]]
Former-commit-id: 1ae82b82db
Former-commit-id: 3f73399ab8 [formerly 4731b10575 ]
Former-commit-id: 46767a2454
|
2014-05-15 13:57:55 -05:00 |
|
Brian.Dyke
|
33211da425
|
CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: 08f69fd3a1 [formerly 81a1affe22 ] [formerly 08f69fd3a1 [formerly 81a1affe22 ] [formerly c81d54b651 [formerly 11acfb00bda7686c68e24903df4831cf57bf86de]]]
Former-commit-id: c81d54b651
Former-commit-id: fe9ee785b6 [formerly cf4eca67af ]
Former-commit-id: 77344c1e1f
|
2014-05-15 14:16:38 -04:00 |
|
Brian Clements
|
067dbeffea
|
Omaha #2536 fixed WarningDecoder.py for WMO TimeTools refactor
Former-commit-id: 99cc000ce0 [formerly ccfc7c2864 ] [formerly 99cc000ce0 [formerly ccfc7c2864 ] [formerly b595be5088 [formerly de519775eb0d47cdc30ecd4669a3663c0cad5300]]]
Former-commit-id: b595be5088
Former-commit-id: 6852256af0 [formerly 82ef0e333b ]
Former-commit-id: 9d727fdfa3
|
2014-05-15 13:14:58 -05:00 |
|
Steve Harris
|
dfc96a2fae
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Former-commit-id: 5e6b9943f1 [formerly 1a06d18686 ] [formerly 5e6b9943f1 [formerly 1a06d18686 ] [formerly c83753b4d3 [formerly 5c1f5dbf543c9cd27cf83158308a9ce34d057201]]]
Former-commit-id: c83753b4d3
Former-commit-id: 3337f2d6d1 [formerly 1b709fb6c3 ]
Former-commit-id: 3e4e9365ca
|
2014-05-15 08:31:27 -05:00 |
|
Roger Ferrel
|
35ac239778
|
Issue #2881 configuration changes.
Former-commit-id: 422504f8b8 [formerly e6b3733fc5 ] [formerly 422504f8b8 [formerly e6b3733fc5 ] [formerly 365c886263 [formerly a36e9351bec9150ba4ade456de76af8701048bcb]]]
Former-commit-id: 365c886263
Former-commit-id: aa2fffd408 [formerly f2d8dee5ea ]
Former-commit-id: 59d4dcd739
|
2014-05-14 16:35:33 -05:00 |
|
Dave Hladky
|
7868ab0891
|
Issue #3168 Move DD retrieval distibution to correct feature/RPM
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: 3b544c74b6 [formerly c72be97b9b ] [formerly 3b544c74b6 [formerly c72be97b9b ] [formerly 783cd9e308 [formerly d94e7f139573caa508b260902870c9f745080bb8]]]
Former-commit-id: 783cd9e308
Former-commit-id: 971910f7fc [formerly 25c2dd4f7d ]
Former-commit-id: 88ebc6921e
|
2014-05-14 16:13:57 -05:00 |
|
Brian.Dyke
|
1d53f6d304
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: f38d0138e6 [formerly 627541512d ] [formerly f38d0138e6 [formerly 627541512d ] [formerly d3fa10028c [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]
Former-commit-id: d3fa10028c
Former-commit-id: b0837b4905 [formerly 68f3a0169e ]
Former-commit-id: f87775928f
|
2014-05-14 16:08:16 -04:00 |
|
Qinglu.Lin
|
603c6a1843
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: b7d276d00f [formerly 75c4b15e8e ] [formerly b7d276d00f [formerly 75c4b15e8e ] [formerly c5097660c2 [formerly 763641d787f7f8c79bf28456314dcc16786702ed]]]
Former-commit-id: c5097660c2
Former-commit-id: bdae3cdfdf [formerly 89fa05128e ]
Former-commit-id: 42c5ce2aff
|
2014-05-14 15:30:16 -04:00 |
|
Brian Clements
|
7473191ba6
|
Omaha #2536 moved WMO Header into new common plugin
moved WMO time parsing code from TimeTools to WMOTimeParser
Former-commit-id: 437d9bb781 [formerly 2b1c7eaa37 ] [formerly 437d9bb781 [formerly 2b1c7eaa37 ] [formerly 6bd43f79ff [formerly c2e57be98850284cb01ba921b9dddcadbe66b311]]]
Former-commit-id: 6bd43f79ff
Former-commit-id: abd29bf492 [formerly ee9757ea39 ]
Former-commit-id: e9ee0bcbde
|
2014-05-14 13:45:09 -05:00 |
|
Richard Peter
|
a576656317
|
Merge "Omaha #2536 moved com.raytheon.edex.plugin.text to com.raytheon.uf.edex.plugin.text" into omaha_14.4.1
Former-commit-id: 9793c69986 [formerly 216a11d390 ] [formerly 9793c69986 [formerly 216a11d390 ] [formerly 7ac6d7f339 [formerly a175a009ed170228187a0fdaa9e2c67a8154fdd5]]]
Former-commit-id: 7ac6d7f339
Former-commit-id: f7f4f9fd38 [formerly 7e4d9dcc8c ]
Former-commit-id: dc4ac03947
|
2014-05-14 11:15:59 -05:00 |
|
Dave Hladky
|
cc7a9bce10
|
Issue #3168 Move retrieval distribution to correct DD RPM
Former-commit-id: 40c24180cf [formerly ca644b93ee ] [formerly 40c24180cf [formerly ca644b93ee ] [formerly 15366714ed [formerly 228ef1ceb7337fa38c370c3218d1c32b4f1302fb]]]
Former-commit-id: 15366714ed
Former-commit-id: f878ccb04e [formerly 268765da81 ]
Former-commit-id: 16a5eed943
|
2014-05-14 11:12:55 -05:00 |
|
Steve Harris
|
80d1cec3ec
|
Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
Former-commit-id: 462609aa3f [formerly c2efe26c11 ] [formerly 462609aa3f [formerly c2efe26c11 ] [formerly 70b95c7636 [formerly 2627e4d38b3dcee82dcf7a6032d692170d50d9ad]]]
Former-commit-id: 70b95c7636
Former-commit-id: 29ecfa91cb [formerly 667dff3919 ]
Former-commit-id: 292bb044a8
|
2014-05-13 15:23:57 -05:00 |
|
Nate Jensen
|
83b9e154f4
|
Merge "Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt" into omaha_14.4.1
Former-commit-id: ce76a51868 [formerly 2480b11576 ] [formerly ce76a51868 [formerly 2480b11576 ] [formerly 12b3a8764e [formerly 477987b9398b980d15c221b9d27780dc25319704]]]
Former-commit-id: 12b3a8764e
Former-commit-id: 172a0684b8 [formerly 72eaf47c4d ]
Former-commit-id: d645104e02
|
2014-05-13 14:28:14 -05:00 |
|
Nate Jensen
|
e3fac09920
|
Merge "Omaha #3133 remove dead activemq code" into omaha_14.4.1
Former-commit-id: e1a78f2f67 [formerly d1ec53984c ] [formerly e1a78f2f67 [formerly d1ec53984c ] [formerly 37f9a61822 [formerly aa2660c615b4d3f605fc6c2c2cdde6667e60e55e]]]
Former-commit-id: 37f9a61822
Former-commit-id: 9706275f81 [formerly e666cee65e ]
Former-commit-id: d85552bac6
|
2014-05-13 14:16:25 -05:00 |
|
Nate Jensen
|
4555dc6ce2
|
Omaha #3133 remove dead activemq code
Change-Id: I1a28b58241bd219f59749328cd23b5abd26bf903
Former-commit-id: c0df19a1fe [formerly e62c36aeb8 ] [formerly c0df19a1fe [formerly e62c36aeb8 ] [formerly 3ecf1e8a0a [formerly eaf4ec9916a706d1ea3c5e5968557b777c2bc936]]]
Former-commit-id: 3ecf1e8a0a
Former-commit-id: ab53488488 [formerly c9b18b44bf ]
Former-commit-id: 6a2691f5b1
|
2014-05-13 14:02:21 -05:00 |
|
Nate Jensen
|
aff00030d5
|
Omaha #3160 remove OBE ncep util plugins
Change-Id: I0af881ba6afb8b2911b6933940dbe5b50b7a2808
Former-commit-id: 548d5ec519 [formerly bb1414677e ] [formerly 548d5ec519 [formerly bb1414677e ] [formerly 5353d06ab6 [formerly d7a64ad2ae20b22bbf346bd59f38526b95c4bfb0]]]
Former-commit-id: 5353d06ab6
Former-commit-id: c7a0638666 [formerly 06d07c9ca4 ]
Former-commit-id: 1d94867dd6
|
2014-05-13 13:28:20 -05:00 |
|
Nate Jensen
|
824c2f805d
|
Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt
Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851
Former-commit-id: e464500dfc [formerly 07426ce408 ] [formerly e464500dfc [formerly 07426ce408 ] [formerly 174fae77d1 [formerly b842a78cdfb945767aecf7da3ad55b71c9d09bfb]]]
Former-commit-id: 174fae77d1
Former-commit-id: c31080d705 [formerly ea7b123eef ]
Former-commit-id: 4a18f1e24b
|
2014-05-13 13:12:54 -05:00 |
|
Brian.Dyke
|
4cedfadd77
|
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
Former-commit-id: 5a2e0c7e1b [formerly e95bc87a19 ] [formerly 5a2e0c7e1b [formerly e95bc87a19 ] [formerly fb4c7e55b3 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]]
Former-commit-id: fb4c7e55b3
Former-commit-id: f9474b087e [formerly 0311366ffb ]
Former-commit-id: 3b7a2f1645
|
2014-05-13 11:23:55 -04:00 |
|
Brian Clements
|
7fb1888b5f
|
Omaha #2536 moved com.raytheon.edex.plugin.text to com.raytheon.uf.edex.plugin.text
minor clode cleanup
Former-commit-id: 648bed10a3 [formerly b9d9beeb46 ] [formerly 648bed10a3 [formerly b9d9beeb46 ] [formerly 994f7d820d [formerly f68b6921c08b8bccf355fa9c991c232f2ffa2076]]]
Former-commit-id: 994f7d820d
Former-commit-id: a7b1987c97 [formerly 558aefad6c ]
Former-commit-id: c68dabe410
|
2014-05-13 09:18:47 -05:00 |
|
Paul.Grell
|
4493e0608e
|
ASM #512 - Need radar data watchdog functionality
Change-Id: I3bcdbe8f267f78be1d0bc64e466ffed70be011a3
Former-commit-id: 0c8c5ef728 [formerly 9988804887 ] [formerly 0c8c5ef728 [formerly 9988804887 ] [formerly 7e036b2bbc [formerly ad727f0b3d820cf2310b4b8cc67639b6d141af6b]]]
Former-commit-id: 7e036b2bbc
Former-commit-id: 30dd189c72 [formerly c6aa190a43 ]
Former-commit-id: c741760dd2
|
2014-05-12 20:00:18 -04:00 |
|
Richard Peter
|
8ea97f96ac
|
Issue #2854: Fix merge of textdb
Change-Id: I626eabc72fbedde983e592ec0c8fb50ed1f52ae3
Former-commit-id: 559907c32d [formerly 1dc654c20e ] [formerly 559907c32d [formerly 1dc654c20e ] [formerly dd35516290 [formerly 2335691bb79c14d96e286f9b0be0f5085711c7bc]]]
Former-commit-id: dd35516290
Former-commit-id: d6805f94d3 [formerly 93520a29d3 ]
Former-commit-id: 2abb1ca090
|
2014-05-12 17:31:06 -05:00 |
|
Richard Peter
|
bb580d8e7c
|
Issue #2060: Consolidate grid indexes.
Change-Id: Ibc77133cd1b016ef85bae61e47e373a30e6e4d23
Former-commit-id: 50fb33488c [formerly 62e215eb89 ] [formerly 50fb33488c [formerly 62e215eb89 ] [formerly 6143d43329 [formerly 892c0f28a13d53118141efe14762deebe169d7ba]]]
Former-commit-id: 6143d43329
Former-commit-id: e2954e54db [formerly 32f7bd8735 ]
Former-commit-id: 28eb882fb6
|
2014-05-12 16:59:34 -05:00 |
|
Nate Jensen
|
dc2ac6e07b
|
Omaha #3133 remove edex dependencies from common.monitor plugin
Change-Id: Iea84cdadc86b9bb137bc2e34d546e51f9978d5e3
Former-commit-id: 88535c69f5 [formerly cc86f19bad ] [formerly 88535c69f5 [formerly cc86f19bad ] [formerly b05630b171 [formerly d25e1bee210a084e17d4ee781eddb42c14735140]]]
Former-commit-id: b05630b171
Former-commit-id: 5d099a3b4b [formerly 3aff81313f ]
Former-commit-id: 363b019ceb
|
2014-05-12 16:46:06 -05:00 |
|
Steve Harris
|
82045e2409
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: 848519177d [formerly cf62cf4a6e ] [formerly 848519177d [formerly cf62cf4a6e ] [formerly fc2bf6b45c [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: 32f255cada [formerly 233922471a ]
Former-commit-id: 74a325ce74
|
2014-05-12 16:13:19 -05:00 |
|
Steve Harris
|
2dbf3f6eca
|
Omaha #3132 - merge omaha_14.3.1 into omaha_14.4.1
Former-commit-id: 0ee182ad6f [formerly e955496335 ] [formerly 0ee182ad6f [formerly e955496335 ] [formerly 4d1b6ddc00 [formerly de217b0bd6bbf72ea138f9bc1286992d43d72ef1]]]
Former-commit-id: 4d1b6ddc00
Former-commit-id: fe671df079 [formerly 233bc14114 ]
Former-commit-id: 7fe9608db0
|
2014-05-12 15:37:43 -05:00 |
|
Richard Peter
|
d502740888
|
Merge "Omaha #3133 remove incorrect dependencies" into omaha_14.4.1
Former-commit-id: 2f186a7789 [formerly c3ed3b97b8 ] [formerly 2f186a7789 [formerly c3ed3b97b8 ] [formerly b7a0429580 [formerly a79d57e86958129b210d13d301b2dc9c1c80f53e]]]
Former-commit-id: b7a0429580
Former-commit-id: 3b0542427c [formerly e36d6eaf3a ]
Former-commit-id: 8a04903632
|
2014-05-12 15:28:46 -05:00 |
|
Nate Jensen
|
75b9bcca15
|
Omaha #3133 remove incorrect dependencies
Change-Id: Iadccd506bb3fd1f009efeda82193138088a2895f
Former-commit-id: 8137d27223 [formerly 2d32999655 ] [formerly 8137d27223 [formerly 2d32999655 ] [formerly d2f86668df [formerly 6db290e14df962d91174727b027b0c5afc1ed0ce]]]
Former-commit-id: d2f86668df
Former-commit-id: 3262ff511d [formerly 559993eaf9 ]
Former-commit-id: bec02c3322
|
2014-05-12 15:21:08 -05:00 |
|
Nate Jensen
|
2c9c760dc6
|
Omaha #3133 remove some unnecessary edex dependencies
Change-Id: I91f10fb36ecadf8e2fc830b135b5d245830417a2
Former-commit-id: 719014f89a [formerly 15329c6b03 ] [formerly 719014f89a [formerly 15329c6b03 ] [formerly 54dbc0ef71 [formerly 846003056f07ef205f59c7b043a31a4fa66e5977]]]
Former-commit-id: 54dbc0ef71
Former-commit-id: 7d417bb6b5 [formerly 2bb07cddf0 ]
Former-commit-id: 54e1ebb9a9
|
2014-05-12 15:07:46 -05:00 |
|
Steve Harris
|
ae3bc184ce
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/SliceSample.py
edexOsgi/com.raytheon.uf.edex.auth/resources/thriftService.properties
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: b3bc71c8a4 [formerly 652fb19bc4 ] [formerly b3bc71c8a4 [formerly 652fb19bc4 ] [formerly 6964df0664 [formerly a20833879f1a0434c562a22a874b1e1722278954]]]
Former-commit-id: 6964df0664
Former-commit-id: 77b2da7a4f [formerly 661eceea83 ]
Former-commit-id: d33fbe7c31
|
2014-05-12 15:05:43 -05:00 |
|
Juliya Dynina
|
3850e43354
|
Merge "ASM #539 - Multiple flag functionality for textdb is not working properly" into asm_14.3.1
Former-commit-id: 161d2039f7 [formerly a203a14e52 ] [formerly 161d2039f7 [formerly a203a14e52 ] [formerly 2578e13ee8 [formerly 3fcd47133ac461046524837f085359b5eb1c7ba7]]]
Former-commit-id: 2578e13ee8
Former-commit-id: f62a15f8e7 [formerly 212d220bf7 ]
Former-commit-id: 783fd63389
|
2014-05-12 14:52:50 -05:00 |
|
Kiran.Shrestha
|
3173d32583
|
ASM #539 - Multiple flag functionality for textdb is not working properly
Change-Id: I6f48e877a356fa576e1311da769c90735e61877f
Former-commit-id: d4970b6f2f [formerly e615e1efc5 ] [formerly d4970b6f2f [formerly e615e1efc5 ] [formerly c162868850 [formerly 2e2de40d75c0ebc0af1b2d70806e834c7d5089f8]]]
Former-commit-id: c162868850
Former-commit-id: d0ed79310a [formerly 943efbc9d0 ]
Former-commit-id: ce58e209b9
|
2014-05-12 15:16:14 -04:00 |
|
Ana Rivera
|
94ceb3698f
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: 7e74e047a0 [formerly 91715e7a3f ] [formerly 7e74e047a0 [formerly 91715e7a3f ] [formerly 81a9d4fa44 [formerly e71ef5db23122405fc6aab71526a9cc3ec3ad823]]]
Former-commit-id: 81a9d4fa44
Former-commit-id: e33c6e2d69 [formerly 88520fc206 ]
Former-commit-id: 8cb1bfc3b8
|
2014-05-12 18:55:06 +00:00 |
|
Brian.Dyke
|
464cc1a479
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3aa2f7974b [formerly 386ec058e1 ] [formerly 3aa2f7974b [formerly 386ec058e1 ] [formerly 41ba5fc348 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]
Former-commit-id: 41ba5fc348
Former-commit-id: dc5bc1d2a4 [formerly 2f704c898d ]
Former-commit-id: 82663c0ab6
|
2014-05-12 14:07:11 -04:00 |
|
Richard Peter
|
3e2b961103
|
Issue #3154: Remove stats reclaimSpace call
Change-Id: I32fb957e236f257e5d8164833d2d2c1adf1fa639
Former-commit-id: a077fd9cc6 [formerly fae9e811fb ] [formerly a077fd9cc6 [formerly fae9e811fb ] [formerly 5648e27bbc [formerly 4e35d1fa5e3e1ebaa5d177d95a5eb11741ae57d2]]]
Former-commit-id: 5648e27bbc
Former-commit-id: 87bb7ac342 [formerly f53d5ba7e9 ]
Former-commit-id: 6e42d24afe
|
2014-05-12 12:27:32 -05:00 |
|
Brian Clements
|
1328487a62
|
Omaha #3152 removed monitorsrv
jmx plugin that is currently not used and required dependency maintenance
Former-commit-id: 2de644c9e3 [formerly 87aa26bf5a ] [formerly 2de644c9e3 [formerly 87aa26bf5a ] [formerly ed8b9f5a89 [formerly 7a00a651afb1c4251b52a852b01696cc861640be]]]
Former-commit-id: ed8b9f5a89
Former-commit-id: 7d9eaa94c5 [formerly b75243d000 ]
Former-commit-id: fa8fe83993
|
2014-05-12 12:13:28 -05:00 |
|