Brian.Dyke
|
38679cddcd
|
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: e68dd70904 [formerly 0fc76ff807 ] [formerly d56843d0e8 ] [formerly e68dd70904 [formerly 0fc76ff807 ] [formerly d56843d0e8 ] [formerly 658cf3dd56 [formerly d56843d0e8 [formerly 142e61e538fb094633933e5a2e1244441fc0106b]]]]
Former-commit-id: 658cf3dd56
Former-commit-id: c3ecdd0017 [formerly c75320efc4 ] [formerly 57abe48bbea6dab9b6ce8e5057dfbbf8a77d3e8d [formerly 380b1d75de ]]
Former-commit-id: 76ce66e268b9af2f519b7f5ef69d4c1046699e5a [formerly a94ec2062f ]
Former-commit-id: 71c5365af3
|
2014-07-02 13:18:10 -04:00 |
|
Steve Harris
|
908e6e908b
|
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: 070e025fb4 [formerly 4882158177 ] [formerly 483a69c58d ] [formerly 070e025fb4 [formerly 4882158177 ] [formerly 483a69c58d ] [formerly fcecd75dfd [formerly 483a69c58d [formerly f947df2bf87c0df3e461be5c6dd72e13a0743f61]]]]
Former-commit-id: fcecd75dfd
Former-commit-id: 8d6e807936 [formerly c59b92895c ] [formerly 0931821f4ace5f034c8b87a9d38c16b0b9763945 [formerly 29c2cc0c29 ]]
Former-commit-id: 03a3c04cf900c39d9298620704be5b5397111cbe [formerly 998c9a4084 ]
Former-commit-id: 984b7b1df4
|
2014-07-01 18:05:43 -05:00 |
|
Ron Anderson
|
26df246878
|
Omaha #3296 A few more minor performance tweaks and some addtional logging.
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)
Former-commit-id: 319819d3a7 [formerly c7a74ab5b1 ] [formerly 2c5f910f90 ] [formerly 319819d3a7 [formerly c7a74ab5b1 ] [formerly 2c5f910f90 ] [formerly 4123073c4e [formerly 2c5f910f90 [formerly a0384ccfb30a877f14893c6cfa62d92117c0bb87]]]]
Former-commit-id: 4123073c4e
Former-commit-id: 9210f3a55d [formerly 0329b4d8f4 ] [formerly 0e147fb71ca969d1fc46cffd1962c97ca7cece30 [formerly 892eb70952 ]]
Former-commit-id: 05ef0d1dfd0a62197a13dc4c5614043584e047f3 [formerly bb91362572 ]
Former-commit-id: ac6b3b0b10
|
2014-07-01 13:56:41 -04:00 |
|
Ron Anderson
|
d6ffc28779
|
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: 1f056e7ab9 [formerly 9818d9b485 ] [formerly beee08c32b ] [formerly 1f056e7ab9 [formerly 9818d9b485 ] [formerly beee08c32b ] [formerly 487c7ee30a [formerly beee08c32b [formerly 49638ba1e9561dea7b318b7adc0f1ab9571170f5]]]]
Former-commit-id: 487c7ee30a
Former-commit-id: 53c11e062a [formerly 699f2aa9bf ] [formerly b61496c3397723d5bba2b477c82852166c411ddf [formerly c16fc8ee7f ]]
Former-commit-id: 115b6d514da08606bd90d2de458c294ecc3e8d7e [formerly 8314f40ec3 ]
Former-commit-id: 2b33bfac7d
|
2014-07-01 13:56:05 -04:00 |
|
Mike Duff
|
b88d5fc6e7
|
Issue #3321 - Fix ingest switch checks
Change-Id: I7de7ee482ab57789874a179499e6c51079e68e12
Former-commit-id: 0de6d3b92a [formerly 1d3aeb881b ] [formerly f17c93bb19 ] [formerly 0de6d3b92a [formerly 1d3aeb881b ] [formerly f17c93bb19 ] [formerly d62c925baa [formerly f17c93bb19 [formerly 5df0ac7f96d1280c1c50f39982693f9503b56f14]]]]
Former-commit-id: d62c925baa
Former-commit-id: 9c869c928e [formerly 5078011147 ] [formerly 939d0365bdd8eecc342c0665f97c4d8d8697f445 [formerly d2cbeff06a ]]
Former-commit-id: cc2d0bb3117f698401c903f5221926bbed77ac62 [formerly 07dda3ecc1 ]
Former-commit-id: 6163364939
|
2014-06-26 16:23:02 -05:00 |
|
Ron Anderson
|
9e022261ae
|
Issue #3317 Fix merge problem that removed GFE notification of D2D purge
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9
Former-commit-id: 8c0311507b [formerly 5dd7a035ac ] [formerly ead09dd683 ] [formerly 8c0311507b [formerly 5dd7a035ac ] [formerly ead09dd683 ] [formerly a6956a8ccd [formerly ead09dd683 [formerly 04805a8957ef14754225f85f4722d8302cde8df3]]]]
Former-commit-id: a6956a8ccd
Former-commit-id: 81db7329c7 [formerly 8b027efdec ] [formerly 95a171c25d2d56a721f156a97720989d676e8e63 [formerly 7abeff57cc ]]
Former-commit-id: efa4e25bb2ebffaf63718fb148cb9143abea2252 [formerly e5b81ccee0 ]
Former-commit-id: b4a2ae3aae
|
2014-06-25 19:12:51 +00:00 |
|
Ron Anderson
|
f48167eb8d
|
Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
Change-Id: If792327215bb9f8db470c95099463e735c462d46
Former-commit-id: cdef6bd26c [formerly f76a2d3700 ] [formerly 898b30fadb ] [formerly cdef6bd26c [formerly f76a2d3700 ] [formerly 898b30fadb ] [formerly 2ac9cd84ec [formerly 898b30fadb [formerly 2a84ea1af7bb767e9e85387de1fd90c662f9f91d]]]]
Former-commit-id: 2ac9cd84ec
Former-commit-id: 0076ccb311 [formerly ddcfe574d8 ] [formerly 63b195143dbea5ac0724f5f746efdcdd457eeade [formerly ff5c0f2c33 ]]
Former-commit-id: 35d631e2502a21703771a49f440d628b03dfec10 [formerly 2cc92ecc69 ]
Former-commit-id: 849625a3e1
|
2014-06-25 13:21:32 -05:00 |
|
Steve Harris
|
6285d3dac6
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 7f040f069c [formerly 3f2058a1ab ] [formerly 89606076ec ] [formerly 7f040f069c [formerly 3f2058a1ab ] [formerly 89606076ec ] [formerly ddc6f2092a [formerly 89606076ec [formerly 174fe6d66525229f328846a1f4564300d7603c10]]]]
Former-commit-id: ddc6f2092a
Former-commit-id: dd6d6c031d [formerly 304d918a7c ] [formerly 018aec814b6ca7a979cdc1b5c53150d6797d0df5 [formerly 1f033d22e6 ]]
Former-commit-id: 7b12be7aa1ce8ea1ba2ec797cf62aa5d09c44514 [formerly 323c240f59 ]
Former-commit-id: 2841134c60
|
2014-06-24 10:57:56 -05:00 |
|
Nate Jensen
|
764d34448d
|
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 e39ecf5473 [formerly 4558fe5862 ] [formerly 845483346f ] [formerly e39ecf5473 [formerly 4558fe5862 ] [formerly 845483346f ] [formerly 65eb76ff66 [formerly 845483346f [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]]]])
Former-commit-id: ef9e4c2439 [formerly 333f8317bb ] [formerly ca27873204 ] [formerly ef9e4c2439 [formerly 333f8317bb ] [formerly ca27873204 ] [formerly 65619399a0 [formerly ca27873204 [formerly f0ad63d2ccf347e92274701f9890e120b9e70140]]]]
Former-commit-id: 65619399a0
Former-commit-id: 8bd6177ae8 [formerly 3add021413 ] [formerly 848ea22f8aa30435c636b4df2b4d2bebcb508ed9 [formerly f9fce25836 ]]
Former-commit-id: 2afe008a92baa2a5e2c3477d56f0dceac797e9ae [formerly e717dbfeb1 ]
Former-commit-id: e62629413d
|
2014-06-23 11:59:26 -05:00 |
|
Steve Harris
|
7e7529e482
|
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: 869235c02a [formerly 16f5ff0979 ] [formerly b84dda5930 ] [formerly 869235c02a [formerly 16f5ff0979 ] [formerly b84dda5930 ] [formerly 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]]
Former-commit-id: 419c5f4aba
Former-commit-id: bab435f286 [formerly af06c5a890 ] [formerly dd639a780b77ef5a2f827ee961c20e9db23d2d31 [formerly 66d30e59a3 ]]
Former-commit-id: 27bd7f3ff5ce8e46cd91569a3f0cf62fa9127e53 [formerly 935542914d ]
Former-commit-id: 196f53e609
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
71ca3ae180
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: e3dc97e246 [formerly be589ceb9b ] [formerly 399c06820a ] [formerly e3dc97e246 [formerly be589ceb9b ] [formerly 399c06820a ] [formerly 8ecdd9a192 [formerly 399c06820a [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: f09000ec64 [formerly e28febcf27 ] [formerly 9723a25d830a41cf2e060dc218ad841643217c3e [formerly 9031f58d02 ]]
Former-commit-id: c6144f8a9f4e5c44b2c2c7442f0100f646622fba [formerly 3e10995d87 ]
Former-commit-id: b602d29456
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
54db4c05b5
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 4766b3f49f [formerly 5064d24e26 ] [formerly 346bf852cd ] [formerly 4766b3f49f [formerly 5064d24e26 ] [formerly 346bf852cd ] [formerly 81832d97e5 [formerly 346bf852cd [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]]]
Former-commit-id: 81832d97e5
Former-commit-id: ba9fb22f58 [formerly 764b729546 ] [formerly 4b8123012f6cebd56dd11d52a9381b3f0d930dd0 [formerly 4bca0769fb ]]
Former-commit-id: 6a3a4bbef432d2ba4ec423342a3283d6354a3f92 [formerly 766974a05d ]
Former-commit-id: 3da13f3d12
|
2014-06-13 13:21:19 -04:00 |
|
Steve Harris
|
2f5548b43d
|
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: 61cb3f45b4 [formerly 3a3277c469 ] [formerly ad6e9fa5ee ] [formerly 61cb3f45b4 [formerly 3a3277c469 ] [formerly ad6e9fa5ee ] [formerly 9510608b74 [formerly ad6e9fa5ee [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]]]
Former-commit-id: 9510608b74
Former-commit-id: a18a176b4f [formerly f78bc57920 ] [formerly 3c82f5e3d74beb4ba9dff59b89b9c241d9fea0d9 [formerly 23dea36a2c ]]
Former-commit-id: fd8723b0332dc846ef24dcb7bd7b484cb4592bd5 [formerly 5a86a00518 ]
Former-commit-id: 435da06069
|
2014-06-11 12:55:44 -05:00 |
|
Brian.Dyke
|
f5befd7116
|
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: 7056d79f70 [formerly 0f07e14bf1 ] [formerly f72380ad60 ] [formerly 7056d79f70 [formerly 0f07e14bf1 ] [formerly f72380ad60 ] [formerly 9ab17ddecb [formerly f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 5893782ec3 [formerly 816dcf74e4 ] [formerly d838e1972c1a8529e2efc996d44a235ce685e8db [formerly 49cd9574d9 ]]
Former-commit-id: b46938d836881d648f671f55d48408d36e6cb22f [formerly a4b39dfca5 ]
Former-commit-id: 1ae1410e46
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
7caa757318
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: 64a10ce12d [formerly ef5c74dece ] [formerly c1b3f9d180 ] [formerly 64a10ce12d [formerly ef5c74dece ] [formerly c1b3f9d180 ] [formerly 8874d41872 [formerly c1b3f9d180 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]]
Former-commit-id: 8874d41872
Former-commit-id: d6ebcad87e [formerly 4f0fc67b1f ] [formerly c763da54d370b72fa17bd0154f839ff80cd9226a [formerly f568b5606a ]]
Former-commit-id: cb4c4f5cdbcafd5e7f18339757c3484f03c17e30 [formerly 81d732477e ]
Former-commit-id: a39afc1dfa
|
2014-06-10 12:52:59 -04:00 |
|
Steve Harris
|
460828069f
|
Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
Former-commit-id: 483d61f414 [formerly 6e09bce335 ] [formerly 14370245fd ] [formerly 483d61f414 [formerly 6e09bce335 ] [formerly 14370245fd ] [formerly bd98f04cde [formerly 14370245fd [formerly 65793ec4d12626b2d3365c5a0e8c3e229972b289]]]]
Former-commit-id: bd98f04cde
Former-commit-id: 69d90af81f [formerly 2445542f10 ] [formerly 053a4d7ccdcd52fb49e7e7bdd39b7346b3706960 [formerly c11a44259e ]]
Former-commit-id: e341f6ab52dbb4bf615dc2cbe67c9dddfb50c0c3 [formerly 2569e13053 ]
Former-commit-id: 67b4501d9b
|
2014-06-09 15:20:03 -05:00 |
|
Xuezhi.Wei
|
8550a855da
|
ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: ba05b6f16a [formerly 81ec03e291 ] [formerly bdbeec662c ] [formerly ba05b6f16a [formerly 81ec03e291 ] [formerly bdbeec662c ] [formerly 33b235a0a4 [formerly bdbeec662c [formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]]]]
Former-commit-id: 33b235a0a4
Former-commit-id: 869427a96a [formerly e2f7548351 ] [formerly 4364d6d4c712093350ad1d6bb73a1c9077cfb53c [formerly 445d58699a ]]
Former-commit-id: 52a1669a642727f3a804c657a32769c37b04af1c [formerly ae0a348358 ]
Former-commit-id: 6911a1f357
|
2014-06-06 17:40:09 +00:00 |
|
Sean Webb
|
a421f14d07
|
Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: 52283357c8 [formerly e0f9eabb45 ] [formerly 016648ffaf ] [formerly 52283357c8 [formerly e0f9eabb45 ] [formerly 016648ffaf ] [formerly cb43d21243 [formerly 016648ffaf [formerly 5556e19903965bea22ca2f11b51fcc1c95cb07f8]]]]
Former-commit-id: cb43d21243
Former-commit-id: b196247c36 [formerly b35f945bec ] [formerly 4706f754c942852a68f343f015e6e1efe8ea3f83 [formerly c52983ab68 ]]
Former-commit-id: d9784dae569d3e3b65f6850c52ce7fab092a38df [formerly 4e6fa39e5e ]
Former-commit-id: 45d5701876
|
2014-06-05 15:03:11 -05:00 |
|
Fay.Liang
|
143da74890
|
ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7
Former-commit-id: 46926b679d [formerly fa2cdbfac1 ] [formerly d1aa160aa7 ] [formerly 46926b679d [formerly fa2cdbfac1 ] [formerly d1aa160aa7 ] [formerly c5e6daa943 [formerly d1aa160aa7 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]]]]
Former-commit-id: c5e6daa943
Former-commit-id: 4c11888976 [formerly 40eeef7fd1 ] [formerly 03458502710ffda685e54402a1e36d9e18ebbf95 [formerly 39efc11cb3 ]]
Former-commit-id: 1894dd6372d16ff3ad9763a5fc2c17a4e819ca79 [formerly ce1e19955e ]
Former-commit-id: 1ddb7a2b0b
|
2014-06-05 15:49:27 -04:00 |
|
Mike Duff
|
e54d8dd946
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: 3a3928cde3 [formerly 28a42f3f10 ] [formerly 8a5acd085d ] [formerly 3a3928cde3 [formerly 28a42f3f10 ] [formerly 8a5acd085d ] [formerly f5f101d416 [formerly 8a5acd085d [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]]]
Former-commit-id: f5f101d416
Former-commit-id: e89e9975c5 [formerly 8e6a50e2ee ] [formerly 63be3054ca051657de6e1a1480a28374ac8bc854 [formerly 87d41ff302 ]]
Former-commit-id: 298e4a841acd8adf70326608c890a015d030d238 [formerly a615c41a57 ]
Former-commit-id: c2751cf532
|
2014-06-05 09:35:07 -05:00 |
|
brian.dyke
|
37b3baed83
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: e1f9c919e6 [formerly 2f53c2e385 ] [formerly 7dde6e1d04 ] [formerly e1f9c919e6 [formerly 2f53c2e385 ] [formerly 7dde6e1d04 ] [formerly ee7c67f7b0 [formerly 7dde6e1d04 [formerly d7b707236a1ee3bca45dee26c10814d9e3c275c8]]]]
Former-commit-id: ee7c67f7b0
Former-commit-id: b2b232c2cc [formerly 8b93c973d6 ] [formerly 5b345e8fad1dba7b952e789980e9a6f6873f05eb [formerly cf49a7217f ]]
Former-commit-id: 1c3c352f258fa1fe750be56c373b425249190beb [formerly 05f691d0cd ]
Former-commit-id: a5b2f384bf
|
2014-05-30 10:07:12 -04:00 |
|
Matthew Howard
|
904a3b24f7
|
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: d0880003a6 [formerly 099185c960 ] [formerly 781d0331ab ] [formerly d0880003a6 [formerly 099185c960 ] [formerly 781d0331ab ] [formerly 8375a2af3e [formerly 781d0331ab [formerly def2351f527613dd62a081161e5f3a87756493ec]]]]
Former-commit-id: 8375a2af3e
Former-commit-id: b7f3c5798e [formerly 11216ced25 ] [formerly d46f8a355df86411c1f5283003df72a741dbec12 [formerly f68748bd63 ]]
Former-commit-id: 46ac2ea21d50d92b8371c417dd9b8efffd8f82a9 [formerly 04c0631701 ]
Former-commit-id: db35baefc8
|
2014-05-29 15:54:37 -05:00 |
|
Shawn.Hooper
|
8fe8f54975
|
ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 4de35d0a2b [formerly 08ad9a66cc ] [formerly fe567b2a5b ] [formerly 4de35d0a2b [formerly 08ad9a66cc ] [formerly fe567b2a5b ] [formerly 5cf0579d20 [formerly fe567b2a5b [formerly 626ee991cd7e9dbfe52342abd9e3fd41b973f72a]]]]
Former-commit-id: 5cf0579d20
Former-commit-id: 94ec109216 [formerly 0fe034cc8b ] [formerly 1363ea6a68426295d8f737eab6b4aff6d84a7400 [formerly 2c476e2bb4 ]]
Former-commit-id: 5db8829a63e68c0d2815ce3a3cb52cffe50787a0 [formerly 3cb14aecd9 ]
Former-commit-id: a4de244bdb
|
2014-05-29 16:56:46 -04:00 |
|
Brian.Dyke
|
9784438847
|
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: 9e0cf9b945 [formerly 47a37b112a ] [formerly b7ef9420e1 ] [formerly 9e0cf9b945 [formerly 47a37b112a ] [formerly b7ef9420e1 ] [formerly 574246b6d4 [formerly b7ef9420e1 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]]]
Former-commit-id: 574246b6d4
Former-commit-id: 7d8cb95e95 [formerly 45d59380ea ] [formerly 8dc10058004612f82f3168b336f93c36d1945933 [formerly 2c1fabb0f8 ]]
Former-commit-id: c03dd203d258e405f3ff9771fe66b95d7dbeaaea [formerly 551def9f1a ]
Former-commit-id: 1bae94a61a
|
2014-05-28 16:25:33 -04:00 |
|
Brian.Dyke
|
ee83737427
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: 0fe87c550c [formerly 6f64664e70 ] [formerly 4c010cf27a ] [formerly 0fe87c550c [formerly 6f64664e70 ] [formerly 4c010cf27a ] [formerly ce81b44f32 [formerly 4c010cf27a [formerly b92ce0c1589c48de73387c142f1302409a3b0cb7]]]]
Former-commit-id: ce81b44f32
Former-commit-id: 90a397bd7e [formerly 4f434e1bf9 ] [formerly 1509b1f949c311ae098b3a9a2397fccd0508dc1c [formerly 73ec45c5b2 ]]
Former-commit-id: d276945aa3a9c7c155010ce4bc7455ff38448cbc [formerly f5bc17ef24 ]
Former-commit-id: 992186e641
|
2014-05-28 09:36:15 -04:00 |
|
Brian.Dyke
|
05c094d6f9
|
CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: fba5604613 [formerly 089b2559bb ] [formerly e95ee60224 ] [formerly fba5604613 [formerly 089b2559bb ] [formerly e95ee60224 ] [formerly e852623f48 [formerly e95ee60224 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]]]]
Former-commit-id: e852623f48
Former-commit-id: 4400514725 [formerly f07b83ce91 ] [formerly e2442f94c9c8f1691bd70abcf54b5b626473d3de [formerly b745ac5926 ]]
Former-commit-id: 81d8abdb8531e95eb3a0bcb835f669e7a5037729 [formerly 21112face5 ]
Former-commit-id: befec4cf01
|
2014-05-28 08:40:56 -04:00 |
|
Brian.Dyke
|
9339e1d334
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1
Former-commit-id: f3b0bdff29 [formerly ea618935d0 ] [formerly 575cebda84 ] [formerly f3b0bdff29 [formerly ea618935d0 ] [formerly 575cebda84 ] [formerly 638acc2c06 [formerly 575cebda84 [formerly 34c582add16be1620f400d78d2f37da8c534f71a]]]]
Former-commit-id: 638acc2c06
Former-commit-id: f30eefeda4 [formerly 2ab1fc6ddf ] [formerly 05ba75929061ec2ce7acb3c93b8c5d42ef107834 [formerly 290b85b556 ]]
Former-commit-id: 7fc30cfb987148987dd92b3d01e3a3049445c44c [formerly 09f2d8b8b1 ]
Former-commit-id: d078a2630e
|
2014-05-27 13:42:09 -04:00 |
|
Brian.Dyke
|
d3a6a77351
|
CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: 86eefc2026 [formerly 4a1b6d70c4 ] [formerly 89a8caddbb ] [formerly 86eefc2026 [formerly 4a1b6d70c4 ] [formerly 89a8caddbb ] [formerly ba8d7dbbb7 [formerly 89a8caddbb [formerly d57f7989982a59a546116b63a406294573844039]]]]
Former-commit-id: ba8d7dbbb7
Former-commit-id: 90cf8cd426 [formerly bb5d88be66 ] [formerly ddbd59370c87b39e43f9f08800b6f899c79a9f83 [formerly ebdd53742c ]]
Former-commit-id: 396b767d5da65f7b066a5f0b100e2c3770df5813 [formerly 1a69aaf89a ]
Former-commit-id: 7e5475923c
|
2014-05-27 13:30:35 -04:00 |
|
Fay.Liang
|
09bf017894
|
ASM #596 - Watch wording not properly inserted into some warning products
Change-Id: I7dc223d95f06a6a259e969cfbb8e4bde2f4b9192
Former-commit-id: 61c177c7b2 [formerly 17f1404221 ] [formerly c007420e22 ] [formerly 61c177c7b2 [formerly 17f1404221 ] [formerly c007420e22 ] [formerly 4fa60f159a [formerly c007420e22 [formerly ed8cd169fe0a531d0d83411f7b1afe787088d406]]]]
Former-commit-id: 4fa60f159a
Former-commit-id: 5e77392ab7 [formerly 3ed3e2249d ] [formerly 8d8e3635fce79ec738b4c75ee9ff6d33751dd44e [formerly 5d763a0f3d ]]
Former-commit-id: 144705b862a68adbc7f6bb69846df6926ebe33de [formerly 605c976986 ]
Former-commit-id: 2ac429bff7
|
2014-05-23 15:47:50 -04:00 |
|
Brian.Dyke
|
4671c25ea4
|
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: 5afaee3d33 [formerly 822ad181bf ] [formerly 2fd18d14d6 ] [formerly 5afaee3d33 [formerly 822ad181bf ] [formerly 2fd18d14d6 ] [formerly db68b80bbd [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]]
Former-commit-id: db68b80bbd
Former-commit-id: 5a07e9c984 [formerly 937b9bb9ce ] [formerly 6fbbfc0267046011d5fd8ba4c15aa6b2ab182188 [formerly ebcaebb28d ]]
Former-commit-id: 6e138f1746a6c0aa092e3c298cd91ece951e39d3 [formerly f42d40c3a3 ]
Former-commit-id: b0b377e811
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
8ad7621cbc
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
Former-commit-id: 9426ddb9a9 [formerly 88a5ecefaa ] [formerly e5f951bf89 ] [formerly 9426ddb9a9 [formerly 88a5ecefaa ] [formerly e5f951bf89 ] [formerly 8c2cccb930 [formerly e5f951bf89 [formerly d9c230fbd50cc5acf1dd5c7c5e775f337de41921]]]]
Former-commit-id: 8c2cccb930
Former-commit-id: 7b6988aa0b [formerly bb2089f2df ] [formerly a2965f6fcb55c7bf469752a36f14c13683c6f1bd [formerly 89d2843610 ]]
Former-commit-id: fbb79af68eeeaa91cfaddc4aea1e0b429540ecca [formerly fe658cb381 ]
Former-commit-id: 774897735a
|
2014-05-20 12:08:29 -04:00 |
|
Brian.Dyke
|
2eca58ce8d
|
CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: c9ef80beeb [formerly 8435ace4f8 ] [formerly 545e7f6ce9 ] [formerly c9ef80beeb [formerly 8435ace4f8 ] [formerly 545e7f6ce9 ] [formerly abf0f995cd [formerly 545e7f6ce9 [formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]]]]
Former-commit-id: abf0f995cd
Former-commit-id: 1f0f7de4c5 [formerly 9af8951a2a ] [formerly af49ed0701c5a48e77ad4fbbb9da056ebd4f6592 [formerly fa13621d8e ]]
Former-commit-id: 9310164288d45c3f9652b0aabd8948d3ef0e220c [formerly 0f5964b03f ]
Former-commit-id: 5d6603320b
|
2014-05-20 11:56:30 -04:00 |
|
Brian.Dyke
|
40f8656824
|
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
Former-commit-id: 99e1c53457 [formerly c2afc26206 ] [formerly 3183283e99 ] [formerly 99e1c53457 [formerly c2afc26206 ] [formerly 3183283e99 ] [formerly dcd238c6a3 [formerly 3183283e99 [formerly 18486e2e8ead4614c05e3a7775cba95cd78053c8]]]]
Former-commit-id: dcd238c6a3
Former-commit-id: fb776b4091 [formerly 4a37cd32bd ] [formerly ec4e89f93aee5394b38539a722d1331582a6eb6f [formerly 353aebe447 ]]
Former-commit-id: bb99efa86111dcde4e9407416c5902c94eb89fed [formerly 3b7e8c2c66 ]
Former-commit-id: 529febf986
|
2014-05-16 08:45:47 -04:00 |
|
Brian.Dyke
|
bb71483e38
|
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: f9a40a24e3 [formerly 2de7de6378 ] [formerly b066572041 ] [formerly f9a40a24e3 [formerly 2de7de6378 ] [formerly b066572041 ] [formerly c8f21e92fe [formerly b066572041 [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]]]
Former-commit-id: c8f21e92fe
Former-commit-id: fc476a1286 [formerly 7cc4e0258d ] [formerly 24586b50613dc8d4739299b6e8346907dcc7c9c1 [formerly 984f56d23c ]]
Former-commit-id: fe64de1e302eac38e0e4ddadb14f850e2fc849b8 [formerly 17d7291548 ]
Former-commit-id: 43210259de
|
2014-05-15 16:40:47 -04:00 |
|
Brian.Dyke
|
fee860b080
|
CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: ac7b375d91 [formerly 08f69fd3a1 ] [formerly 81a1affe22 ] [formerly ac7b375d91 [formerly 08f69fd3a1 ] [formerly 81a1affe22 ] [formerly c81d54b651 [formerly 81a1affe22 [formerly 11acfb00bda7686c68e24903df4831cf57bf86de]]]]
Former-commit-id: c81d54b651
Former-commit-id: cc09a85660 [formerly fe9ee785b6 ] [formerly ba771ce0e5ca8e2a54ee28250070016a434fb6dc [formerly cf4eca67af ]]
Former-commit-id: fe9511cd130e36a1d2520f1222e0d8300e6da5c7 [formerly 77344c1e1f ]
Former-commit-id: 33211da425
|
2014-05-15 14:16:38 -04:00 |
|
Dave Hladky
|
d4046a9dfe
|
Issue #3168 Move DD retrieval distibution to correct feature/RPM
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: 0e73a4d2a8 [formerly 3b544c74b6 ] [formerly c72be97b9b ] [formerly 0e73a4d2a8 [formerly 3b544c74b6 ] [formerly c72be97b9b ] [formerly 783cd9e308 [formerly c72be97b9b [formerly d94e7f139573caa508b260902870c9f745080bb8]]]]
Former-commit-id: 783cd9e308
Former-commit-id: 8248c69492 [formerly 971910f7fc ] [formerly 86951af90c14b8faa6f0c72f4a63cc9c73be2211 [formerly 25c2dd4f7d ]]
Former-commit-id: 83ad1d6914a482b12087c4ed7477ccc1404ba0a1 [formerly 88ebc6921e ]
Former-commit-id: 7868ab0891
|
2014-05-14 16:13:57 -05:00 |
|
Brian.Dyke
|
0febfec9e7
|
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: 8c0709798d [formerly f38d0138e6 ] [formerly 627541512d ] [formerly 8c0709798d [formerly f38d0138e6 ] [formerly 627541512d ] [formerly d3fa10028c [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]]
Former-commit-id: d3fa10028c
Former-commit-id: a6b42a776b [formerly b0837b4905 ] [formerly 91d88625eae6852df94fbb04133d89826c605aad [formerly 68f3a0169e ]]
Former-commit-id: c54c6441e46c95271889db670ff46e1bedce8459 [formerly f87775928f ]
Former-commit-id: 1d53f6d304
|
2014-05-14 16:08:16 -04:00 |
|
Dave Hladky
|
f640ba1eeb
|
Issue #3168 Move retrieval distribution to correct DD RPM
Former-commit-id: 6a80ab5dfb [formerly 40c24180cf ] [formerly ca644b93ee ] [formerly 6a80ab5dfb [formerly 40c24180cf ] [formerly ca644b93ee ] [formerly 15366714ed [formerly ca644b93ee [formerly 228ef1ceb7337fa38c370c3218d1c32b4f1302fb]]]]
Former-commit-id: 15366714ed
Former-commit-id: 02b2c05d0f [formerly f878ccb04e ] [formerly 45e1e810677500f358f651b3e5c5e4eb36b9a380 [formerly 268765da81 ]]
Former-commit-id: 73f6de0ebf8291c21795f1249a9c5a88c06f7da6 [formerly 16a5eed943 ]
Former-commit-id: cc7a9bce10
|
2014-05-14 11:12:55 -05:00 |
|
Steve Harris
|
8094b08c85
|
Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
Former-commit-id: 2441e29987 [formerly 462609aa3f ] [formerly c2efe26c11 ] [formerly 2441e29987 [formerly 462609aa3f ] [formerly c2efe26c11 ] [formerly 70b95c7636 [formerly c2efe26c11 [formerly 2627e4d38b3dcee82dcf7a6032d692170d50d9ad]]]]
Former-commit-id: 70b95c7636
Former-commit-id: 5e4d9f666a [formerly 29ecfa91cb ] [formerly 3673c0fa579962cf3044e6137a5507dc3bb4de20 [formerly 667dff3919 ]]
Former-commit-id: e594bb821ece4ea9a92f332eaab265eb722f2b1a [formerly 292bb044a8 ]
Former-commit-id: 80d1cec3ec
|
2014-05-13 15:23:57 -05:00 |
|
Brian.Dyke
|
db6b79a08f
|
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: e705786d12 [formerly 5a2e0c7e1b ] [formerly e95bc87a19 ] [formerly e705786d12 [formerly 5a2e0c7e1b ] [formerly e95bc87a19 ] [formerly fb4c7e55b3 [formerly e95bc87a19 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]]]
Former-commit-id: fb4c7e55b3
Former-commit-id: bdbb6ec0fe [formerly f9474b087e ] [formerly adafd612a1e8c387205bf9a2e7dcfd2a03d117c9 [formerly 0311366ffb ]]
Former-commit-id: 4d9e420076ab9a3d2cb731f4d97896138289b45b [formerly 3b7a2f1645 ]
Former-commit-id: 4cedfadd77
|
2014-05-13 11:23:55 -04:00 |
|
Steve Harris
|
24df80c520
|
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: 343444715e [formerly 848519177d ] [formerly cf62cf4a6e ] [formerly 343444715e [formerly 848519177d ] [formerly cf62cf4a6e ] [formerly fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: ae2d525c8a [formerly 32f255cada ] [formerly a8635bd2e1fdd0fe84e47c2435e9f0073d86e4e2 [formerly 233922471a ]]
Former-commit-id: d12e1920a9ce76da64ae45fed23fe5b2ed9fa884 [formerly 74a325ce74 ]
Former-commit-id: 82045e2409
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
9bc1055c87
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 82ce970ad6 [formerly 3aa2f7974b ] [formerly 386ec058e1 ] [formerly 82ce970ad6 [formerly 3aa2f7974b ] [formerly 386ec058e1 ] [formerly 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]]
Former-commit-id: 41ba5fc348
Former-commit-id: 4004b627e2 [formerly dc5bc1d2a4 ] [formerly 3193dce8b50276edb5c6e0829236339aa91b9172 [formerly 2f704c898d ]]
Former-commit-id: 4b5ff1e5a8372daadb66b3b58132714ed0a54eae [formerly 82663c0ab6 ]
Former-commit-id: 464cc1a479
|
2014-05-12 14:07:11 -04:00 |
|
Ben Steffensmeier
|
e5f61fe0b8
|
Issue #2289 Fix TempOfTe at small pressure values.
Former-commit-id: b2d89eae80 [formerly d051416c76 ] [formerly 2754326906 ] [formerly b2d89eae80 [formerly d051416c76 ] [formerly 2754326906 ] [formerly 102d560686 [formerly 2754326906 [formerly a114bf15018ab86ec1511c13704fd6e1e3feed99]]]]
Former-commit-id: 102d560686
Former-commit-id: 5a3a22e222 [formerly 763d8ef96f ] [formerly 2b99b27378f8db1ef1ba538130d9ab1f354e5f81 [formerly d55535c36c ]]
Former-commit-id: e6e92e33f205a857d75468b23d2fe4e70ff32d4b [formerly 3290f7ee59 ]
Former-commit-id: 54487dede7
|
2014-05-12 10:11:34 -05:00 |
|
Gang.Zhang
|
7813539881
|
ASM #589 - Fix FFMP Templates generation issue
Change-Id: Ia3715ccb03113f3d2528e516c2568255935f4086
Former-commit-id: 9a1ba6435f [formerly fe742a06b9 ] [formerly f771c8fed4 ] [formerly 9a1ba6435f [formerly fe742a06b9 ] [formerly f771c8fed4 ] [formerly 165b953b5c [formerly f771c8fed4 [formerly 560a3cc5ac5e9e059b581294e48e69a9978272e5]]]]
Former-commit-id: 165b953b5c
Former-commit-id: 0df353adef [formerly b5622c5a5e ] [formerly c52cb3d752f4e837e43da31aafc2b34121b20bdc [formerly c4b32db009 ]]
Former-commit-id: 4d8f77319f31888fa2ee502eae244ce728293a6d [formerly 561169825f ]
Former-commit-id: 6c46d5323e
|
2014-05-09 11:51:18 +01:00 |
|
Steve Harris
|
96bd49cc22
|
Merge branch 'master_14.2.1' (14.2.1-23) into omaha_14.2.1
Former-commit-id: bffbcf61b8 [formerly a7211a72f0 ] [formerly c3509757f0 ] [formerly bffbcf61b8 [formerly a7211a72f0 ] [formerly c3509757f0 ] [formerly 0392577b6c [formerly c3509757f0 [formerly 575adeb94784b32ac0d89e3c4dd506c2fe500266]]]]
Former-commit-id: 0392577b6c
Former-commit-id: d191cc2ebd [formerly 8c5eb7774e ] [formerly 9abd56b89aacb0711cf15f70eebafb12f9e5773d [formerly 6694af2d5e ]]
Former-commit-id: 9da9bed1e53505b39d613806127348e6f88a3c1d [formerly 7819c2878f ]
Former-commit-id: ab4d7cc569
|
2014-05-07 08:45:41 -05:00 |
|
Ron Anderson
|
1de70ff00b
|
Issue #3129 Change smartInit back to 1 thread on 64-bit
Change-Id: Ie1e17e145d2d88485d91a29e4c74c737e4658038
Former-commit-id: 5c0b04b00f [formerly 6c5f1a9ed3 ] [formerly b43e6d64c3 ] [formerly 5c0b04b00f [formerly 6c5f1a9ed3 ] [formerly b43e6d64c3 ] [formerly 32c95e50a7 [formerly b43e6d64c3 [formerly f2e15f4ab034f617a3a64814125dfee73b5070ac]]]]
Former-commit-id: 32c95e50a7
Former-commit-id: 679c56b13c [formerly 4a8b1296ea ] [formerly e00d6110ed92bf62013fa5e8a2aa8c6a54034736 [formerly 85b86bd6e2 ]]
Former-commit-id: 900c5c861e52cbb3ad86dfe63261dbbe2548e2bc [formerly cb6ed5a32c ]
Former-commit-id: 2616943080
|
2014-05-06 16:01:31 -05:00 |
|
Ron Anderson
|
efac3b0017
|
Issue #3118 Fix gridLocation issues with smartInit databases
Change-Id: I4660418234a5c721381c7986b793d9339c81c603
Former-commit-id: 32a23a5d03 [formerly 93320d43c9 ] [formerly b4815af7f8 ] [formerly 32a23a5d03 [formerly 93320d43c9 ] [formerly b4815af7f8 ] [formerly ba0c26edf6 [formerly b4815af7f8 [formerly a4a5522abbb439066acfa3567d0036cf044ef9c7]]]]
Former-commit-id: ba0c26edf6
Former-commit-id: 3f137282ab [formerly 03ac05ef4c ] [formerly 37fa908e6e020de500d2bf296af4b231a9fefa81 [formerly b694dbe2e1 ]]
Former-commit-id: 8d9e2e4725b197ff3a2ed345086c564f937403e9 [formerly 98c11671d2 ]
Former-commit-id: 8d44fdcfb1
|
2014-05-06 15:09:25 -05:00 |
|
Brian.Dyke
|
498d65cf2b
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 341e5c86c6 [formerly 5461f75e41 ] [formerly 238e8f7ba1 ] [formerly 341e5c86c6 [formerly 5461f75e41 ] [formerly 238e8f7ba1 ] [formerly e3b0b44b71 [formerly 238e8f7ba1 [formerly c6ba49e1206ed113b57a9fa39f5720ee9b3b979a]]]]
Former-commit-id: e3b0b44b71
Former-commit-id: ec78d8eaa6 [formerly 430543e848 ] [formerly 3127e516c70af6d10210a6ef7215b4867cdcea5c [formerly 43cc1d0b91 ]]
Former-commit-id: f87a93c760bf92376069fe122ffd646b7e7f003e [formerly fe9aeb1961 ]
Former-commit-id: 4f425f71e6
|
2014-05-06 11:34:46 -04:00 |
|
Steve Harris
|
55644af2ca
|
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: 010301045d [formerly 9e149df799 ] [formerly 6ef3b9f1e5 ] [formerly 010301045d [formerly 9e149df799 ] [formerly 6ef3b9f1e5 ] [formerly 1c8f2f6185 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 4b54c0498e [formerly 927a87b126 ] [formerly b9b41ab717fa5a9d55725f89e087b2c62f5811fa [formerly b797b4b1fa ]]
Former-commit-id: 66b0c211b5eee3caba67b313d56f7fda8fa60cc9 [formerly 17318b1870 ]
Former-commit-id: 4fe84ba0fd
|
2014-05-05 08:21:02 -05:00 |
|
Shawn.Hooper
|
dce9554e76
|
ASM #131 - Additional fix for Lightning Data Decoder
Change-Id: I014a5ce61e495c2339f17ef22f706a3ad1a1ee72
Former-commit-id: 14d7d0d9c1 [formerly faa9f20f84 ] [formerly 76d4a7ac73 ] [formerly 14d7d0d9c1 [formerly faa9f20f84 ] [formerly 76d4a7ac73 ] [formerly d80a278cb7 [formerly 76d4a7ac73 [formerly 4bada72eef85bf38522b40526643ebd8bddc9005]]]]
Former-commit-id: d80a278cb7
Former-commit-id: d7c9d002e4 [formerly 98631b46c8 ] [formerly 9b67c4e1a530eaeddd1ca8d655f855d1549c9c7e [formerly b5b0c01eb9 ]]
Former-commit-id: 5e08bac98d9b5a0a45521af2960f267e5996aae2 [formerly a58a5e95da ]
Former-commit-id: 66e0a8cb74
|
2014-05-02 12:48:18 -04:00 |
|