Commit graph

4984 commits

Author SHA1 Message Date
steve.naples
75969ceec2 ASM #253 Update RadarBiasTableDialog fix issue of not saving.
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673

Former-commit-id: 9021eca6b32dd2b3859cd928c14a0e40a4907c13
2014-07-08 16:32:08 +00:00
Brian.Dyke
2ef4767652 Merge branch 'asm_14.2.2' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.2
Former-commit-id: 845aebda9d8af143e3a6828c066b291e0343a020
2014-07-07 13:33:35 -04: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
Juliya Dynina
244b2f5f3a Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
Former-commit-id: d6ae0d12f104de38b8fa770e4576b96a32da360c
2014-07-02 14:17:11 -05:00
Steve Harris
136af3f7e2 Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
Former-commit-id: c88d3136dbadab41df5fbf37b4b7c821dfcd07d9
2014-07-02 13:38:08 -05: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.naples
66c3241bc4 ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f

Former-commit-id: b9f868e0ced53987accf675bfe2ce1a1f4f34da1
2014-07-02 15:30:48 +00:00
Nate Jensen
c003d70168 Issue #3337 disable logback packaging data in cave
Former-commit-id: db10ba5a37dbe219110f4f902bf9257f2f220b3d
2014-07-02 09:24:15 -05: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
Brian.Dyke
3ed9e07c44 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 625eefb5f53e292d947233c1cd0aa031e61ca9ea
2014-07-01 15:41:10 -04: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
Juliya Dynina
b5e4bc1fdc Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb
2014-07-01 10:05:57 -05:00
Juliya Dynina
0fe04515ad Merge "ASM #660 - WarnGen can generate polygons that do not match hatched area" into asm_14.2.2
Former-commit-id: 2260a05df61ec1dc21cc6619fcb48713368e3a46
2014-07-01 09:01:55 -05:00
Sean.Webb
c24c2f1e3e ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03

Former-commit-id: add5d004eca457782f957a95262e880b91dfeeb1
2014-06-30 16:06:25 -04:00
Qinglu.Lin
1200633cd2 ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81

Former-commit-id: 4d50beaed59d785d923e357f8ce036f6625ce4b4
2014-06-30 13:09:15 -04:00
David Friedman
18b3b61afc ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652

Former-commit-id: 993663cbee3f794981fc7f4cc97f96e3b86c47f8
2014-06-27 19:17:55 +00: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
Brian.Dyke
a5ae302690 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 632577244e843dd122c00b745e973730c7920246
2014-06-26 10:39:49 -04: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
steve.naples
efe877d82b ASM #253 Update RadarBiasTableDialog to allow undo changes.
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9

Former-commit-id: fcd20d35abf3617701cc797baf9ba2b3984379c8
2014-06-24 15:52:23 +00: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
Nate Jensen
51da67dd3f Issue #3307 fix xml serialization of looping field
Former-commit-id: c6ce72840a4ee0f44eacff46015b5382d86dd47f
2014-06-23 09:54:11 -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
30d8644fa5 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
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
David Friedman
b8542c1332 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
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
Mike Duff
81ab64d7ff 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
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
Juliya Dynina
80a83bd44c 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
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
Michael Gamazaychikov
c07bcacbf8 ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75

Former-commit-id: a38308fa5a6efe9a07ecd84bd93662bea32afc94
2014-06-05 13:43:04 +01:00
Zhidong.Hao
26c6801620 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
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
Steve Harris
c7ef7878f5 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
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