Ron Anderson
|
f7b8803180
|
Issue #3146 Added check for duplicate smartInit.
Added alertViz message for GFE site activation failure
Change-Id: I68a2b995922ac9ba7e75d02f317357fddde7f004
Former-commit-id: 9f4e89347a [formerly 0c0739bd72] [formerly 9f4e89347a [formerly 0c0739bd72] [formerly 468668e19b [formerly eafc406ec75d5e1a1bbc93bb0b472a053922eb3a]]]
Former-commit-id: 468668e19b
Former-commit-id: ed7f6f731e [formerly a917ea16a4]
Former-commit-id: 7877809108
|
2014-07-09 16:42:43 -05:00 |
|
steve.naples
|
db04c1a2ec
|
ASM #253 Update RadarBiasTableDialog fix issue of not saving undo.
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88
Former-commit-id: 2ebfd61f12 [formerly 339fcbc18a] [formerly 2ebfd61f12 [formerly 339fcbc18a] [formerly 0bd7b6c65b [formerly 24b9a6e0801cc653062a71d86090df3836aa86a4]]]
Former-commit-id: 0bd7b6c65b
Former-commit-id: 6b58fb2509 [formerly aa8c11d134]
Former-commit-id: 458dd1fe8f
|
2014-07-09 15:42:51 +00:00 |
|
Ron Anderson
|
a1a980ed6e
|
Issue #3332 Fixed race condition which could cause GFE grid saving to hang
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652
Former-commit-id: 4b4629a2fd [formerly 111b04296c] [formerly 4b4629a2fd [formerly 111b04296c] [formerly 5efba03474 [formerly b01b72b896b894568acce6a8dc4d45328a06067a]]]
Former-commit-id: 5efba03474
Former-commit-id: e39615ab7a [formerly 1cc0ff4ab7]
Former-commit-id: 0a7c4c855e
|
2014-07-09 08:56:06 -05:00 |
|
steve.naples
|
10e2eaa6ed
|
ASM #253 Update RadarBiasTableDialog fix issue of not saving.
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673
Former-commit-id: 29ca2338b8 [formerly 75969ceec2] [formerly 29ca2338b8 [formerly 75969ceec2] [formerly 24b0d49a5b [formerly 9021eca6b32dd2b3859cd928c14a0e40a4907c13]]]
Former-commit-id: 24b0d49a5b
Former-commit-id: 94e246b619 [formerly ea071e81f5]
Former-commit-id: 23ff3f3fe7
|
2014-07-08 16:32:08 +00:00 |
|
Brian.Dyke
|
f14f792377
|
Merge branch 'asm_14.2.2' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.2
Former-commit-id: a33fdeb558 [formerly 2ef4767652] [formerly a33fdeb558 [formerly 2ef4767652] [formerly 89c0457b1d [formerly 845aebda9d8af143e3a6828c066b291e0343a020]]]
Former-commit-id: 89c0457b1d
Former-commit-id: 6be18f0dd4 [formerly a2dc10847c]
Former-commit-id: e9e9abd3db
|
2014-07-07 13:33:35 -04:00 |
|
David Friedman
|
c44e9f88f6
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: 8784501bba [formerly a45fe1dad0] [formerly 8784501bba [formerly a45fe1dad0] [formerly db8977e281 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]]
Former-commit-id: db8977e281
Former-commit-id: 5270711c5d [formerly d36834080e]
Former-commit-id: 4f53bbd556
|
2014-07-03 13:58:24 +00:00 |
|
Juliya Dynina
|
d3073a02a7
|
Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
Former-commit-id: 67580e73cd [formerly 244b2f5f3a] [formerly 67580e73cd [formerly 244b2f5f3a] [formerly 470d50b4e4 [formerly d6ae0d12f104de38b8fa770e4576b96a32da360c]]]
Former-commit-id: 470d50b4e4
Former-commit-id: d705c8c8a4 [formerly b1cec7d40e]
Former-commit-id: 3f043077b3
|
2014-07-02 14:17:11 -05:00 |
|
Steve Harris
|
a19a11998f
|
Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
Former-commit-id: 9b7f820b06 [formerly 136af3f7e2] [formerly 9b7f820b06 [formerly 136af3f7e2] [formerly 0ef8a057f9 [formerly c88d3136dbadab41df5fbf37b4b7c821dfcd07d9]]]
Former-commit-id: 0ef8a057f9
Former-commit-id: cb8192cfaf [formerly 9f61f60f65]
Former-commit-id: a12a736737
|
2014-07-02 13:38:08 -05:00 |
|
Brian.Dyke
|
71c5365af3
|
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: 0fc76ff807 [formerly d56843d0e8] [formerly 0fc76ff807 [formerly d56843d0e8] [formerly 658cf3dd56 [formerly 142e61e538fb094633933e5a2e1244441fc0106b]]]
Former-commit-id: 658cf3dd56
Former-commit-id: c75320efc4 [formerly 380b1d75de]
Former-commit-id: a94ec2062f
|
2014-07-02 13:18:10 -04:00 |
|
steve.naples
|
9f52699bd2
|
ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f
Former-commit-id: 3d75da3db0 [formerly 66c3241bc4] [formerly 3d75da3db0 [formerly 66c3241bc4] [formerly 4e959af1b4 [formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]]
Former-commit-id: 4e959af1b4
Former-commit-id: f1c92f1e35 [formerly 3cfabd29bc]
Former-commit-id: 93c8f822cc
|
2014-07-02 15:30:48 +00:00 |
|
Nate Jensen
|
b54a9694ee
|
Issue #3337 disable logback packaging data in cave
Former-commit-id: 56363ffc4a [formerly c003d70168] [formerly 56363ffc4a [formerly c003d70168] [formerly 939fde1575 [formerly db10ba5a37dbe219110f4f902bf9257f2f220b3d]]]
Former-commit-id: 939fde1575
Former-commit-id: c421e2de75 [formerly a2cfcd8716]
Former-commit-id: 75ffabbcc2
|
2014-07-02 09:24:15 -05:00 |
|
Steve Harris
|
984b7b1df4
|
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: 4882158177 [formerly 483a69c58d] [formerly 4882158177 [formerly 483a69c58d] [formerly fcecd75dfd [formerly f947df2bf87c0df3e461be5c6dd72e13a0743f61]]]
Former-commit-id: fcecd75dfd
Former-commit-id: c59b92895c [formerly 29c2cc0c29]
Former-commit-id: 998c9a4084
|
2014-07-01 18:05:43 -05:00 |
|
Brian.Dyke
|
d58b49a14a
|
Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 7b205d97ca [formerly 3ed9e07c44] [formerly 7b205d97ca [formerly 3ed9e07c44] [formerly f8759e2317 [formerly 625eefb5f53e292d947233c1cd0aa031e61ca9ea]]]
Former-commit-id: f8759e2317
Former-commit-id: d5352e6909 [formerly f58b4d01a4]
Former-commit-id: 7d03e29db6
|
2014-07-01 15:41:10 -04:00 |
|
Steve Harris
|
15267970e4
|
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: f68e051938 [formerly 1c8dc56d49] [formerly f68e051938 [formerly 1c8dc56d49] [formerly 30cdbff7f8 [formerly 382c772c196711d230395f34a04559c188880622]]]
Former-commit-id: 30cdbff7f8
Former-commit-id: a4d91c59d6 [formerly 6f9129ac78]
Former-commit-id: d600ed9acf
|
2014-07-01 13:38:18 -05:00 |
|
Ron Anderson
|
ac6b3b0b10
|
Omaha #3296 A few more minor performance tweaks and some addtional logging.
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)
Former-commit-id: c7a74ab5b1 [formerly 2c5f910f90] [formerly c7a74ab5b1 [formerly 2c5f910f90] [formerly 4123073c4e [formerly a0384ccfb30a877f14893c6cfa62d92117c0bb87]]]
Former-commit-id: 4123073c4e
Former-commit-id: 0329b4d8f4 [formerly 892eb70952]
Former-commit-id: bb91362572
|
2014-07-01 13:56:41 -04:00 |
|
Ron Anderson
|
2b33bfac7d
|
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: 9818d9b485 [formerly beee08c32b] [formerly 9818d9b485 [formerly beee08c32b] [formerly 487c7ee30a [formerly 49638ba1e9561dea7b318b7adc0f1ab9571170f5]]]
Former-commit-id: 487c7ee30a
Former-commit-id: 699f2aa9bf [formerly c16fc8ee7f]
Former-commit-id: 8314f40ec3
|
2014-07-01 13:56:05 -04:00 |
|
Steve Harris
|
8fb747ad27
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 2f2958df37 [formerly d4dc1723c1] [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 7fb4663d75 [formerly dcbab5621f]
Former-commit-id: 71357da9d2
|
2014-07-01 11:08:46 -04:00 |
|
Juliya Dynina
|
5a9181fcc1
|
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: bf765525b7 [formerly b5e4bc1fdc] [formerly bf765525b7 [formerly b5e4bc1fdc] [formerly 102da2d0f7 [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]]
Former-commit-id: 102da2d0f7
Former-commit-id: b4d23902a7 [formerly 7ed2a8cbd4]
Former-commit-id: 8f3581340b
|
2014-07-01 10:05:57 -05:00 |
|
Juliya Dynina
|
5bfd88dd2f
|
Merge "ASM #660 - WarnGen can generate polygons that do not match hatched area" into asm_14.2.2
Former-commit-id: 3ee22b685d [formerly 0fe04515ad] [formerly 3ee22b685d [formerly 0fe04515ad] [formerly 3aeceabb7a [formerly 2260a05df61ec1dc21cc6619fcb48713368e3a46]]]
Former-commit-id: 3aeceabb7a
Former-commit-id: 5c26ceab68 [formerly 39cfec2067]
Former-commit-id: 5d11d65233
|
2014-07-01 09:01:55 -05:00 |
|
Sean.Webb
|
342896c0d7
|
ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03
Former-commit-id: 5288764393 [formerly c24c2f1e3e] [formerly 5288764393 [formerly c24c2f1e3e] [formerly 0b29e66772 [formerly add5d004eca457782f957a95262e880b91dfeeb1]]]
Former-commit-id: 0b29e66772
Former-commit-id: cd179cddff [formerly a875ae3f24]
Former-commit-id: c9d3906b32
|
2014-06-30 16:06:25 -04:00 |
|
Qinglu.Lin
|
7235488050
|
ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81
Former-commit-id: 1180b31875 [formerly 1200633cd2] [formerly 1180b31875 [formerly 1200633cd2] [formerly 1d52d020eb [formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]]]
Former-commit-id: 1d52d020eb
Former-commit-id: 5e07f13dd8 [formerly 6e4b7e1e6d]
Former-commit-id: 3eaedad105
|
2014-06-30 13:09:15 -04:00 |
|
David Friedman
|
18b1d17550
|
ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652
Former-commit-id: c4967a96fb [formerly 18b3b61afc] [formerly c4967a96fb [formerly 18b3b61afc] [formerly dc25040a25 [formerly 993663cbee3f794981fc7f4cc97f96e3b86c47f8]]]
Former-commit-id: dc25040a25
Former-commit-id: 217aa6ce76 [formerly b546ca6ac8]
Former-commit-id: a756c1436b
|
2014-06-27 19:17:55 +00:00 |
|
Mike Duff
|
6163364939
|
Issue #3321 - Fix ingest switch checks
Change-Id: I7de7ee482ab57789874a179499e6c51079e68e12
Former-commit-id: 1d3aeb881b [formerly f17c93bb19] [formerly 1d3aeb881b [formerly f17c93bb19] [formerly d62c925baa [formerly 5df0ac7f96d1280c1c50f39982693f9503b56f14]]]
Former-commit-id: d62c925baa
Former-commit-id: 5078011147 [formerly d2cbeff06a]
Former-commit-id: 07dda3ecc1
|
2014-06-26 16:23:02 -05:00 |
|
Brian.Dyke
|
a1d171c6c3
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: a48268a1d6 [formerly a5ae302690] [formerly a48268a1d6 [formerly a5ae302690] [formerly 3df14b5a94 [formerly 632577244e843dd122c00b745e973730c7920246]]]
Former-commit-id: 3df14b5a94
Former-commit-id: 88411f7f52 [formerly 97619031c9]
Former-commit-id: 9197f47f29
|
2014-06-26 10:39:49 -04:00 |
|
Ron Anderson
|
b4a2ae3aae
|
Issue #3317 Fix merge problem that removed GFE notification of D2D purge
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9
Former-commit-id: 5dd7a035ac [formerly ead09dd683] [formerly 5dd7a035ac [formerly ead09dd683] [formerly a6956a8ccd [formerly 04805a8957ef14754225f85f4722d8302cde8df3]]]
Former-commit-id: a6956a8ccd
Former-commit-id: 8b027efdec [formerly 7abeff57cc]
Former-commit-id: e5b81ccee0
|
2014-06-25 19:12:51 +00:00 |
|
Ron Anderson
|
849625a3e1
|
Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
Change-Id: If792327215bb9f8db470c95099463e735c462d46
Former-commit-id: f76a2d3700 [formerly 898b30fadb] [formerly f76a2d3700 [formerly 898b30fadb] [formerly 2ac9cd84ec [formerly 2a84ea1af7bb767e9e85387de1fd90c662f9f91d]]]
Former-commit-id: 2ac9cd84ec
Former-commit-id: ddcfe574d8 [formerly ff5c0f2c33]
Former-commit-id: 2cc92ecc69
|
2014-06-25 13:21:32 -05:00 |
|
Steve Harris
|
2841134c60
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 3f2058a1ab [formerly 89606076ec] [formerly 3f2058a1ab [formerly 89606076ec] [formerly ddc6f2092a [formerly 174fe6d66525229f328846a1f4564300d7603c10]]]
Former-commit-id: ddc6f2092a
Former-commit-id: 304d918a7c [formerly 1f033d22e6]
Former-commit-id: 323c240f59
|
2014-06-24 10:57:56 -05:00 |
|
Ben Steffensmeier
|
364953e5b7
|
Issue #2661 Fix grid time series errors when there is no data.
Former-commit-id: 2c1988017e [formerly aaa146b2d0] [formerly 2c1988017e [formerly aaa146b2d0] [formerly 46b8688597 [formerly 2fdb5867131b54f5d74ef3edd8c621c8807d4d99]]]
Former-commit-id: 46b8688597
Former-commit-id: 9edc1153de [formerly c184936340]
Former-commit-id: 17e92d31bd
|
2014-06-24 10:57:02 -05:00 |
|
steve.naples
|
3638879057
|
ASM #253 Update RadarBiasTableDialog to allow undo changes.
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9
Former-commit-id: 2a49bbda2f [formerly efe877d82b] [formerly 2a49bbda2f [formerly efe877d82b] [formerly 90ed511478 [formerly fcd20d35abf3617701cc797baf9ba2b3984379c8]]]
Former-commit-id: 90ed511478
Former-commit-id: 2e77b74c44 [formerly 362e1ce880]
Former-commit-id: 5dcda5cabc
|
2014-06-24 15:52:23 +00:00 |
|
Nate Jensen
|
e62629413d
|
Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit e8d704968a2a87105489ad9cb51cd8aea78401aa [formerly 65eb76ff66] [formerly 4558fe5862 [formerly 845483346f] [formerly 4558fe5862 [formerly 845483346f] [formerly 65eb76ff66 [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]]])
Former-commit-id: 333f8317bb [formerly ca27873204] [formerly 333f8317bb [formerly ca27873204] [formerly 65619399a0 [formerly f0ad63d2ccf347e92274701f9890e120b9e70140]]]
Former-commit-id: 65619399a0
Former-commit-id: 3add021413 [formerly f9fce25836]
Former-commit-id: e717dbfeb1
|
2014-06-23 11:59:26 -05:00 |
|
Nate Jensen
|
b1ab93a361
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: c7c0d9cb4b [formerly 51da67dd3f] [formerly c7c0d9cb4b [formerly 51da67dd3f] [formerly 97ef9fc343 [formerly c6ce72840a4ee0f44eacff46015b5382d86dd47f]]]
Former-commit-id: 97ef9fc343
Former-commit-id: 416e6fc85d [formerly a3c20eb98a]
Former-commit-id: 9a3a4d5bfd
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
196f53e609
|
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: 16f5ff0979 [formerly b84dda5930] [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]
Former-commit-id: 419c5f4aba
Former-commit-id: af06c5a890 [formerly 66d30e59a3]
Former-commit-id: 935542914d
|
2014-06-20 14:01:55 -04:00 |
|
Nate Jensen
|
55aa294dad
|
Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
Former-commit-id: 4558fe5862 [formerly 845483346f] [formerly 4558fe5862 [formerly 845483346f] [formerly 65eb76ff66 [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]]
Former-commit-id: 65eb76ff66
Former-commit-id: 0ea72ce3ed [formerly d1766dc991]
Former-commit-id: 0d1d12158d
|
2014-06-19 10:02:34 -05:00 |
|
Brian.Dyke
|
b602d29456
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: be589ceb9b [formerly 399c06820a] [formerly be589ceb9b [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: e28febcf27 [formerly 9031f58d02]
Former-commit-id: 3e10995d87
|
2014-06-18 08:55:49 -04:00 |
|
Brian Clements
|
ed95461c36
|
Issue #2903 prevent shared display crash from missing point style enum value
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173
Former-commit-id: b8a0a60df6 [formerly 9946f78241] [formerly b8a0a60df6 [formerly 9946f78241] [formerly 5d03048fff [formerly 5d298b39786d37aa365ccfe2c337214d1e46f1a9]]]
Former-commit-id: 5d03048fff
Former-commit-id: dbe778cbe0 [formerly 59d92634b0]
Former-commit-id: 48e634b14a
|
2014-06-17 17:01:23 -05:00 |
|
Nate Jensen
|
cc66519671
|
Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
Former-commit-id: eddc8f373a [formerly c2aa87470d] [formerly eddc8f373a [formerly c2aa87470d] [formerly ed36453f09 [formerly 93f63c0d42941001e4d59a4840df5e5b525592bf]]]
Former-commit-id: ed36453f09
Former-commit-id: 50715cc012 [formerly ef61539a8a]
Former-commit-id: 48496aeb9b
|
2014-06-16 08:31:30 -05:00 |
|
Steve Harris
|
e0be1f390e
|
Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1
Former-commit-id: 0c3dcb77d5 [formerly 1d2b8aeb7b] [formerly 0c3dcb77d5 [formerly 1d2b8aeb7b] [formerly 6c82cc5c3d [formerly 4041e8afbb4bf1c0c416624140d74d27e963f9c8]]]
Former-commit-id: 6c82cc5c3d
Former-commit-id: f2d30c4c62 [formerly 7a8741d8fa]
Former-commit-id: 61112bc258
|
2014-06-16 07:49:58 -05:00 |
|
Brian.Dyke
|
03f8202ff2
|
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: 06c565d74f [formerly 30d8644fa5] [formerly 06c565d74f [formerly 30d8644fa5] [formerly 482f915b42 [formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]]]
Former-commit-id: 482f915b42
Former-commit-id: c1bd7a0c55 [formerly 072a4a9d63]
Former-commit-id: ce9ebc90f5
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
3da13f3d12
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 5064d24e26 [formerly 346bf852cd] [formerly 5064d24e26 [formerly 346bf852cd] [formerly 81832d97e5 [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]]
Former-commit-id: 81832d97e5
Former-commit-id: 764b729546 [formerly 4bca0769fb]
Former-commit-id: 766974a05d
|
2014-06-13 13:21:19 -04:00 |
|
Brian Clements
|
88bc3a948e
|
Issue #2903 changed collaboration jaxb xml to be base64 encoded
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c
Former-commit-id: 909561d871 [formerly 5424eb0258] [formerly 909561d871 [formerly 5424eb0258] [formerly ef0ecfd1d4 [formerly afcfdf1ed08cd64deb085b909f0965e4ab68d92d]]]
Former-commit-id: ef0ecfd1d4
Former-commit-id: 077976c912 [formerly 9e39c19a7d]
Former-commit-id: 649d0cf43f
|
2014-06-12 13:40:33 -05:00 |
|
Brian.Dyke
|
40fb1f6159
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e802508e98 [formerly a011c0b6bb] [formerly e802508e98 [formerly a011c0b6bb] [formerly 6fcc2604e0 [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]]]
Former-commit-id: 6fcc2604e0
Former-commit-id: 50073f34b2 [formerly 10696504a0]
Former-commit-id: ac235bf20a
|
2014-06-12 07:07:17 -04:00 |
|
Steve Harris
|
435da06069
|
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: 3a3277c469 [formerly ad6e9fa5ee] [formerly 3a3277c469 [formerly ad6e9fa5ee] [formerly 9510608b74 [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]]
Former-commit-id: 9510608b74
Former-commit-id: f78bc57920 [formerly 23dea36a2c]
Former-commit-id: 5a86a00518
|
2014-06-11 12:55:44 -05:00 |
|
Ana Rivera
|
eb270f539a
|
VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Former-commit-id: 4b515bfd0a [formerly 65e90953c2] [formerly 4b515bfd0a [formerly 65e90953c2] [formerly 9da58db461 [formerly 83640ccce75b600d53a0d44ae1528c312b7947b5]]]
Former-commit-id: 9da58db461
Former-commit-id: e249a71765 [formerly 540a286595]
Former-commit-id: 5721d2df05
|
2014-06-11 17:35:55 +00:00 |
|
David Friedman
|
3b686ca052
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: 6d0d3f5ba5 [formerly b8542c1332] [formerly 6d0d3f5ba5 [formerly b8542c1332] [formerly 1c84c31e30 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]]]
Former-commit-id: 1c84c31e30
Former-commit-id: 0ba91c6c28 [formerly 8c8f54994b]
Former-commit-id: d50646b479
|
2014-06-11 13:37:16 +00:00 |
|
dmsys
|
770c42f203
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: fc77941b88 [formerly b7cfb9e752] [formerly fc77941b88 [formerly b7cfb9e752] [formerly 1f0a6112c7 [formerly 161ffe72d115c7846697afa8be559d2f5fd199da]]]
Former-commit-id: 1f0a6112c7
Former-commit-id: f85d84246f [formerly c377233491]
Former-commit-id: 76a9b2bdee
|
2014-06-10 17:17:26 -04:00 |
|
Ben Steffensmeier
|
97976eea56
|
Issue #2661 Fix vector derived parameter.
Former-commit-id: 1f270a6059 [formerly cd60dc028a] [formerly 1f270a6059 [formerly cd60dc028a] [formerly 0a66c47341 [formerly 238043b8c4286e398176d4d6c78e585e33faa5da]]]
Former-commit-id: 0a66c47341
Former-commit-id: 07731bab04 [formerly 799f7baacc]
Former-commit-id: 90f23e48ad
|
2014-06-10 15:44:33 -05:00 |
|
Brian.Dyke
|
1ae1410e46
|
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: 0f07e14bf1 [formerly f72380ad60] [formerly 0f07e14bf1 [formerly f72380ad60] [formerly 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 816dcf74e4 [formerly 49cd9574d9]
Former-commit-id: a4b39dfca5
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
a39afc1dfa
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: ef5c74dece [formerly c1b3f9d180] [formerly ef5c74dece [formerly c1b3f9d180] [formerly 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]
Former-commit-id: 8874d41872
Former-commit-id: 4f0fc67b1f [formerly f568b5606a]
Former-commit-id: 81d732477e
|
2014-06-10 12:52:59 -04:00 |
|
Steve Harris
|
67b4501d9b
|
Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
Former-commit-id: 6e09bce335 [formerly 14370245fd] [formerly 6e09bce335 [formerly 14370245fd] [formerly bd98f04cde [formerly 65793ec4d12626b2d3365c5a0e8c3e229972b289]]]
Former-commit-id: bd98f04cde
Former-commit-id: 2445542f10 [formerly c11a44259e]
Former-commit-id: 2569e13053
|
2014-06-09 15:20:03 -05:00 |
|
Mike Duff
|
bb122607cc
|
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: b876d9755a [formerly 81ab64d7ff] [formerly b876d9755a [formerly 81ab64d7ff] [formerly 39173c380c [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]]]
Former-commit-id: 39173c380c
Former-commit-id: 60fe02137f [formerly b880d171d4]
Former-commit-id: 4b9f707a06
|
2014-06-06 16:03:14 -04:00 |
|