Mike Duff
|
a35529bba4
|
Issue #3370 - Revert "Issue #3370 - Fix for mulitple shef types in same file."
This reverts commit b5b61650d3 [formerly 0c0b14929f74f2262559a4919171623870139313].
Former-commit-id: 43cbf77bb90ba12a6ee11bc35b18c226f9490a88
|
2014-07-10 16:01:56 -05:00 |
|
Mike Duff
|
b5b61650d3
|
Issue #3370 - Fix for mulitple shef types in same file.
Change-Id: I23110d7887b68ff073afdf61815d7dced9c4a3ad
Former-commit-id: 0c0b14929f74f2262559a4919171623870139313
|
2014-07-10 10:05:05 -05:00 |
|
David Friedman
|
a45fe1dad0
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20
|
2014-07-03 13:58:24 +00:00 |
|
Brian.Dyke
|
d56843d0e8
|
Merge branch 'm1413_m1422_merge' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2 CM-MERGE:14.1.3-4 into 14.2.2
Former-commit-id: 142e61e538fb094633933e5a2e1244441fc0106b
|
2014-07-02 13:18:10 -04:00 |
|
Steve Harris
|
483a69c58d
|
Merge branch 'master_14.1.3' into master_14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: f947df2bf87c0df3e461be5c6dd72e13a0743f61
|
2014-07-01 18:05:43 -05:00 |
|
Ron Anderson
|
2c5f910f90
|
Omaha #3296 A few more minor performance tweaks and some addtional logging.
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)
Former-commit-id: a0384ccfb30a877f14893c6cfa62d92117c0bb87
|
2014-07-01 13:56:41 -04:00 |
|
Ron Anderson
|
beee08c32b
|
Omaha #3296 Added performance logging. Moved backup and purging to separate java thread. Cached PythonScript.
Change-Id: I9814345b512674269f17f4bf61bd615f0a50b059
(cherry picked from commit a11bcadd76eb9f9597e23ee609fd9cb364ad26ac)
Former-commit-id: 49638ba1e9561dea7b318b7adc0f1ab9571170f5
|
2014-07-01 13:56:05 -04:00 |
|
Mike Duff
|
f17c93bb19
|
Issue #3321 - Fix ingest switch checks
Change-Id: I7de7ee482ab57789874a179499e6c51079e68e12
Former-commit-id: 5df0ac7f96d1280c1c50f39982693f9503b56f14
|
2014-06-26 16:23:02 -05:00 |
|
Ron Anderson
|
ead09dd683
|
Issue #3317 Fix merge problem that removed GFE notification of D2D purge
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9
Former-commit-id: 04805a8957ef14754225f85f4722d8302cde8df3
|
2014-06-25 19:12:51 +00:00 |
|
Ron Anderson
|
898b30fadb
|
Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
Change-Id: If792327215bb9f8db470c95099463e735c462d46
Former-commit-id: 2a84ea1af7bb767e9e85387de1fd90c662f9f91d
|
2014-06-25 13:21:32 -05:00 |
|
Steve Harris
|
89606076ec
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 174fe6d66525229f328846a1f4564300d7603c10
|
2014-06-24 10:57:56 -05:00 |
|
Nate Jensen
|
ca27873204
|
Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit 845483346f [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716])
Former-commit-id: f0ad63d2ccf347e92274701f9890e120b9e70140
|
2014-06-23 11:59:26 -05:00 |
|
Steve Harris
|
b84dda5930
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: ce5767f2bbf5c9627bd43e766c6193c261c48af3
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
399c06820a
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 86dc406cd227362abc5274f4cd64813ceb91d00d
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
346bf852cd
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: df99fcb0a4be27d5f2d22935847fb55b8bfbbb58
|
2014-06-13 13:21:19 -04:00 |
|
Steve Harris
|
ad6e9fa5ee
|
Merge branch 'master_14.2.2' (14.2.2-13) into omaha_14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: If5dae78936eddf1bc4ee63f35beb96a0cb9defb9
Former-commit-id: cf56d49dc5a197fa114fa6c468860d63621a9cdc
|
2014-06-11 12:55:44 -05:00 |
|
Brian.Dyke
|
f72380ad60
|
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
c1b3f9d180
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: b859032bcec187616adfd414dd1ce5fe27829e9e
|
2014-06-10 12:52:59 -04:00 |
|
Steve Harris
|
14370245fd
|
Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
Former-commit-id: 65793ec4d12626b2d3365c5a0e8c3e229972b289
|
2014-06-09 15:20:03 -05:00 |
|
Xuezhi.Wei
|
bdbeec662c
|
ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: f7b5f3bbc71cc251e19f1764ee7756050895b7a3
|
2014-06-06 17:40:09 +00:00 |
|
Sean Webb
|
016648ffaf
|
Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: 5556e19903965bea22ca2f11b51fcc1c95cb07f8
|
2014-06-05 15:03:11 -05:00 |
|
Fay.Liang
|
d1aa160aa7
|
ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7
Former-commit-id: fc06896ae4d9adf0973522313f5e65df6ac67fa4
|
2014-06-05 15:49:27 -04:00 |
|
Mike Duff
|
8a5acd085d
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: 3f1f9cf4fa6207edae642db5cffdc8284091f31a
|
2014-06-05 09:35:07 -05:00 |
|
brian.dyke
|
7dde6e1d04
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: d7b707236a1ee3bca45dee26c10814d9e3c275c8
|
2014-05-30 10:07:12 -04:00 |
|
Matthew Howard
|
781d0331ab
|
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: def2351f527613dd62a081161e5f3a87756493ec
|
2014-05-29 15:54:37 -05:00 |
|
Shawn.Hooper
|
fe567b2a5b
|
ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 626ee991cd7e9dbfe52342abd9e3fd41b973f72a
|
2014-05-29 16:56:46 -04:00 |
|
Brian.Dyke
|
b7ef9420e1
|
Merge remote-tracking branch 'remotes/origin/master_14.2.1' into master_14.2.2 CM-MERGE:14.2.1-30 into 14.2.2
Former-commit-id: f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da
|
2014-05-28 16:25:33 -04:00 |
|
Brian.Dyke
|
4c010cf27a
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: b92ce0c1589c48de73387c142f1302409a3b0cb7
|
2014-05-28 09:36:15 -04:00 |
|
Brian.Dyke
|
e95ee60224
|
CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: c85d4369600bfc24405386aa71713d7f2d58b201
|
2014-05-28 08:40:56 -04:00 |
|
Brian.Dyke
|
575cebda84
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1
Former-commit-id: 34c582add16be1620f400d78d2f37da8c534f71a
|
2014-05-27 13:42:09 -04:00 |
|
Brian.Dyke
|
89a8caddbb
|
CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: d57f7989982a59a546116b63a406294573844039
|
2014-05-27 13:30:35 -04:00 |
|
Fay.Liang
|
c007420e22
|
ASM #596 - Watch wording not properly inserted into some warning products
Change-Id: I7dc223d95f06a6a259e969cfbb8e4bde2f4b9192
Former-commit-id: ed8cd169fe0a531d0d83411f7b1afe787088d406
|
2014-05-23 15:47:50 -04:00 |
|
Brian.Dyke
|
2fd18d14d6
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: ed430b59789d9a00e20bdaadc8d55b92a4a4064b
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
e5f951bf89
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
Former-commit-id: d9c230fbd50cc5acf1dd5c7c5e775f337de41921
|
2014-05-20 12:08:29 -04:00 |
|
Brian.Dyke
|
545e7f6ce9
|
CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22
|
2014-05-20 11:56:30 -04:00 |
|
Brian.Dyke
|
3183283e99
|
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
Former-commit-id: 18486e2e8ead4614c05e3a7775cba95cd78053c8
|
2014-05-16 08:45:47 -04:00 |
|
Brian.Dyke
|
b066572041
|
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: d75db45cdfa20fed7568b825ca0dfd8c8689d22a
|
2014-05-15 16:40:47 -04:00 |
|
Brian.Dyke
|
81a1affe22
|
CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: 11acfb00bda7686c68e24903df4831cf57bf86de
|
2014-05-15 14:16:38 -04:00 |
|
Dave Hladky
|
c72be97b9b
|
Issue #3168 Move DD retrieval distibution to correct feature/RPM
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: d94e7f139573caa508b260902870c9f745080bb8
|
2014-05-14 16:13:57 -05:00 |
|
Brian.Dyke
|
627541512d
|
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: f7d6bee49c5777e5d63c724eba1242a1baf153ac
|
2014-05-14 16:08:16 -04:00 |
|
Dave Hladky
|
ca644b93ee
|
Issue #3168 Move retrieval distribution to correct DD RPM
Former-commit-id: 228ef1ceb7337fa38c370c3218d1c32b4f1302fb
|
2014-05-14 11:12:55 -05:00 |
|
Steve Harris
|
c2efe26c11
|
Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
Former-commit-id: 2627e4d38b3dcee82dcf7a6032d692170d50d9ad
|
2014-05-13 15:23:57 -05:00 |
|
Brian.Dyke
|
e95bc87a19
|
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: 019c1405290753ed47cecd9a0bb26c220d78d010
|
2014-05-13 11:23:55 -04:00 |
|
Steve Harris
|
cf62cf4a6e
|
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: a830db2a282e6a29d119fc0d3357c2223c48d175
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
386ec058e1
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3
|
2014-05-12 14:07:11 -04:00 |
|
Ben Steffensmeier
|
2754326906
|
Issue #2289 Fix TempOfTe at small pressure values.
Former-commit-id: a114bf15018ab86ec1511c13704fd6e1e3feed99
|
2014-05-12 10:11:34 -05:00 |
|
Gang.Zhang
|
f771c8fed4
|
ASM #589 - Fix FFMP Templates generation issue
Change-Id: Ia3715ccb03113f3d2528e516c2568255935f4086
Former-commit-id: 560a3cc5ac5e9e059b581294e48e69a9978272e5
|
2014-05-09 11:51:18 +01:00 |
|
Steve Harris
|
c3509757f0
|
Merge branch 'master_14.2.1' (14.2.1-23) into omaha_14.2.1
Former-commit-id: 575adeb94784b32ac0d89e3c4dd506c2fe500266
|
2014-05-07 08:45:41 -05:00 |
|
Ron Anderson
|
b43e6d64c3
|
Issue #3129 Change smartInit back to 1 thread on 64-bit
Change-Id: Ie1e17e145d2d88485d91a29e4c74c737e4658038
Former-commit-id: f2e15f4ab034f617a3a64814125dfee73b5070ac
|
2014-05-06 16:01:31 -05:00 |
|
Ron Anderson
|
b4815af7f8
|
Issue #3118 Fix gridLocation issues with smartInit databases
Change-Id: I4660418234a5c721381c7986b793d9339c81c603
Former-commit-id: a4a5522abbb439066acfa3567d0036cf044ef9c7
|
2014-05-06 15:09:25 -05:00 |
|