Steve Harris
|
fcecd75dfd
|
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
|
4123073c4e
|
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
|
487c7ee30a
|
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 |
|
Steve Harris
|
ddc6f2092a
|
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
|
65619399a0
|
Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit 65eb76ff66 [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716])
Former-commit-id: f0ad63d2ccf347e92274701f9890e120b9e70140
|
2014-06-23 11:59:26 -05:00 |
|
Nate Jensen
|
97ef9fc343
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: c6ce72840a4ee0f44eacff46015b5382d86dd47f
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
419c5f4aba
|
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
|
8ecdd9a192
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 86dc406cd227362abc5274f4cd64813ceb91d00d
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
482f915b42
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Merge branch 'master_14.1.3_merge' into master_14.1.3
Former-commit-id: 4b317062ce5c35823210cbbf023c0f0fc8051ef3
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
81832d97e5
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: df99fcb0a4be27d5f2d22935847fb55b8bfbbb58
|
2014-06-13 13:21:19 -04:00 |
|
Steve Harris
|
9510608b74
|
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 |
|
David Friedman
|
1c84c31e30
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: a3f4fd6537f3847011e199e0f043968d9f595937
|
2014-06-11 13:37:16 +00:00 |
|
Brian.Dyke
|
9ab17ddecb
|
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
|
8874d41872
|
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
|
bd98f04cde
|
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 |
|
Mike Duff
|
39173c380c
|
ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing.
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1
Former-commit-id: 7fe0dae041cb68aba968e22d5895cce22a210ee6
|
2014-06-06 16:03:14 -04:00 |
|
Xuezhi.Wei
|
33b235a0a4
|
ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: f7b5f3bbc71cc251e19f1764ee7756050895b7a3
|
2014-06-06 17:40:09 +00:00 |
|
Juliya Dynina
|
87216a87de
|
Merge "ASM #114 - Problem with Distance Speed Tool." into asm_14.2.2
Former-commit-id: 1e1c7cbcee94e782338d440d585a3217ad606725
|
2014-06-06 09:50:36 -05:00 |
|
Sean Webb
|
cb43d21243
|
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
|
c5e6daa943
|
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
|
f5f101d416
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: 3f1f9cf4fa6207edae642db5cffdc8284091f31a
|
2014-06-05 09:35:07 -05:00 |
|
Michael Gamazaychikov
|
50ab77046b
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: a38308fa5a6efe9a07ecd84bd93662bea32afc94
|
2014-06-05 13:43:04 +01:00 |
|
Zhidong.Hao
|
71ab6b9ed0
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 74597b2630ffd8d984b193f72126a9a5d0b3a942
|
2014-06-03 11:55:32 -04:00 |
|
brian.dyke
|
ee7c67f7b0
|
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
|
8375a2af3e
|
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
|
5cf0579d20
|
ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 626ee991cd7e9dbfe52342abd9e3fd41b973f72a
|
2014-05-29 16:56:46 -04:00 |
|
Steve Harris
|
9313e045bf
|
Merge branch 'master_14.2.2' (14.2.2-9,10,11) into omaha_14.2.2
Former-commit-id: 03b376033b3374694bc8a6e0a2c55b830db058e1
|
2014-05-29 07:45:24 -05:00 |
|
Brian.Dyke
|
574246b6d4
|
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
|
ce81b44f32
|
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
|
e852623f48
|
CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: c85d4369600bfc24405386aa71713d7f2d58b201
|
2014-05-28 08:40:56 -04:00 |
|
Brian.Dyke
|
638acc2c06
|
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
|
ba8d7dbbb7
|
CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: d57f7989982a59a546116b63a406294573844039
|
2014-05-27 13:30:35 -04:00 |
|
Fay.Liang
|
4fa60f159a
|
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 |
|
Steve Harris
|
acecfd7dfa
|
Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
Former-commit-id: a125cbc03cc5cace25e35b3516c34f9d7060a78e
|
2014-05-22 13:52:02 -05:00 |
|
brian.dyke
|
f74b1707f9
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 59ff65f9d31cef6549ea8912adceb9ed4c7d11f6
|
2014-05-22 12:46:56 -04:00 |
|
Michael Gamazaychikov
|
5bff9f2ac8
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75
|
2014-05-21 15:12:08 +01:00 |
|
Brian.Dyke
|
db68b80bbd
|
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
|
8c2cccb930
|
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
|
abf0f995cd
|
CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22
|
2014-05-20 11:56:30 -04:00 |
|
Brian.Dyke
|
d5a4669fc4
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
Former-commit-id: 19032f03b1d2166f4afd936bb2b56e0b4851d9f4
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
06c2478539
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470
|
2014-05-19 13:26:45 -04:00 |
|
Gang.Zhang
|
9c1587b92d
|
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 5880dcd0b727c3d473873b8382ace78955ab800b
|
2014-05-19 15:40:41 +01:00 |
|
Brian.Dyke
|
e9bd17a21f
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114
|
2014-05-19 07:55:42 -04:00 |
|
David Friedman
|
a55e851780
|
Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
Former-commit-id: a4c1c5524c31384c3532076ee151fd9a294367d2
|
2014-05-16 16:40:38 -05:00 |
|
David Friedman
|
eab9a6b6d7
|
ASM #240 - RPS lists delivered by awips2-rcm out of date
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb
Former-commit-id: 880c5d7259a5af17f2452fa3bd9f18d852c81d82
|
2014-05-16 21:38:34 +00:00 |
|
David Friedman
|
3b69a240c8
|
ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5
Former-commit-id: 4fd6bbfba29a39bf125269ab8342b826995e3d86
|
2014-05-16 21:34:59 +00:00 |
|
Brian.Dyke
|
dcd238c6a3
|
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
|
c8f21e92fe
|
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
|
c81d54b651
|
CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: 11acfb00bda7686c68e24903df4831cf57bf86de
|
2014-05-15 14:16:38 -04:00 |
|
Steve Harris
|
a6aa34210c
|
Merge branch 'master_14.2.2' (14.2.2-9) into omaha_14.2.2
Former-commit-id: b1bf5bdc4a81c55c9cd30ac77857509a2e8f5a08
|
2014-05-15 08:12:49 -05:00 |
|