Brian.Dyke
|
b77d938e42
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 9ef7783251 [formerly e55b892fc3] [formerly 9ef7783251 [formerly e55b892fc3] [formerly c26e0cd548 [formerly 499b825592fdbdf150c918e5f3abacc4f37ddd70]]]
Former-commit-id: c26e0cd548
Former-commit-id: efff77a72c [formerly a3618e103e]
Former-commit-id: 3e66c55f09
|
2014-07-21 11:18:25 -04:00 |
|
Fay.Liang
|
ba05a236a7
|
ASM #15468 Shefdecode failed to ingest RVF product at OUN
Change-Id: I6238c25f867c0e6e491831e9c2b1c47e22484620
Former-commit-id: 7cbd90018e [formerly 87d50e7296] [formerly 7cbd90018e [formerly 87d50e7296] [formerly a00be8447d [formerly 3637d6387396f88811ec3964bd61d10ce0ee38eb]]]
Former-commit-id: a00be8447d
Former-commit-id: cc238af632 [formerly e69a6fe6f5]
Former-commit-id: 66a3732b4b
|
2014-07-15 10:22:09 -04:00 |
|
Nate Jensen
|
fa9cc74703
|
Issue #3372 make LocalizationStreamHandler thread safe
Change-Id: I208b66fbd2b0bfcd225c3df98f96bcdcf5cb9a88
Former-commit-id: 801ed7154f [formerly 47bf21d7b5] [formerly 801ed7154f [formerly 47bf21d7b5] [formerly aaa0ed7ed7 [formerly 87d5faa03ea63759a6805ed063174fb09ca4800a]]]
Former-commit-id: aaa0ed7ed7
Former-commit-id: e47111f601 [formerly eeba10c11d]
Former-commit-id: a802b19c29
|
2014-07-14 09:18:16 -05:00 |
|
Fay.Liang
|
3a4cff44cc
|
ASM #15468 Shefdecode failed to ingest RVF product at OUN
Change-Id: Ie345c88c4a3a0ff995c4d33772f90e863bed7ee5
Former-commit-id: 34465f09ce [formerly 400561ac9c] [formerly 34465f09ce [formerly 400561ac9c] [formerly 65677246c2 [formerly f78783d2ea194539414294abff46d4f2acda65d1]]]
Former-commit-id: 65677246c2
Former-commit-id: 475da269d8 [formerly 9285e0530f]
Former-commit-id: 60b7095e20
|
2014-07-11 15:19:08 -04:00 |
|
Juliya Dynina
|
dbed262c80
|
Merge "ASM #15557 - Restore ability to display HPCGuide2.5" into asm_14.2.2
Former-commit-id: b9cd9042dd [formerly ac39f9cb43] [formerly b9cd9042dd [formerly ac39f9cb43] [formerly 8d967f1ecf [formerly 9826716e2a5f59826e8a3789ca8d2d8f8dc58cce]]]
Former-commit-id: 8d967f1ecf
Former-commit-id: 15eef54b93 [formerly 6b490f5881]
Former-commit-id: 08098dfebd
|
2014-07-11 08:37:30 -05:00 |
|
Mike Duff
|
327f695d0c
|
Issue #3370 - Revert "Issue #3370 - Fix for mulitple shef types in same file."
This reverts commit 0d73c880f8b96034bf1f9b443aeb8dfcad2be382 [formerly 30655cf2ca] [formerly e3b7a99388 [formerly b5b61650d3] [formerly e3b7a99388 [formerly b5b61650d3] [formerly 30655cf2ca [formerly 0c0b14929f74f2262559a4919171623870139313]]]].
Former-commit-id: c8bfcd54a3 [formerly a35529bba4] [formerly c8bfcd54a3 [formerly a35529bba4] [formerly 73c75303a8 [formerly 43cbf77bb90ba12a6ee11bc35b18c226f9490a88]]]
Former-commit-id: 73c75303a8
Former-commit-id: 6b1031a927 [formerly 6f18256c56]
Former-commit-id: 08275089f5
|
2014-07-10 16:01:56 -05:00 |
|
Melissa Porricel
|
60bae53945
|
ASM #15557 - Restore ability to display HPCGuide2.5
Change-Id: Ibdcdd0aa95e406b5cd886dc8f51e74a3cde54d17
Change-Id: I5594c2151026247d48e657a30c7b4f94b14f036f
Former-commit-id: 1e5bef6820 [formerly d3c29b834d] [formerly 1e5bef6820 [formerly d3c29b834d] [formerly 1f7cf4a165 [formerly 5998e7ad9690e3b87805c75dcb711d299e8f1427]]]
Former-commit-id: 1f7cf4a165
Former-commit-id: c6a7e3bf85 [formerly 055dd5133f]
Former-commit-id: 408f192088
|
2014-07-10 16:15:12 -04:00 |
|
Mike Duff
|
918b247d79
|
Issue #3370 - Fix for mulitple shef types in same file.
Change-Id: I23110d7887b68ff073afdf61815d7dced9c4a3ad
Former-commit-id: e3b7a99388 [formerly b5b61650d3] [formerly e3b7a99388 [formerly b5b61650d3] [formerly 30655cf2ca [formerly 0c0b14929f74f2262559a4919171623870139313]]]
Former-commit-id: 30655cf2ca
Former-commit-id: 7a988c92fa [formerly 69fb1ccf35]
Former-commit-id: 2c0488534a
|
2014-07-10 10:05:05 -05: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 |
|
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 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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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.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 |
|
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 |
|
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 |
|
Xuezhi.Wei
|
6911a1f357
|
ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: 81ec03e291 [formerly bdbeec662c] [formerly 81ec03e291 [formerly bdbeec662c] [formerly 33b235a0a4 [formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]]]
Former-commit-id: 33b235a0a4
Former-commit-id: e2f7548351 [formerly 445d58699a]
Former-commit-id: ae0a348358
|
2014-06-06 17:40:09 +00:00 |
|
Sean Webb
|
45d5701876
|
Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: e0f9eabb45 [formerly 016648ffaf] [formerly e0f9eabb45 [formerly 016648ffaf] [formerly cb43d21243 [formerly 5556e19903965bea22ca2f11b51fcc1c95cb07f8]]]
Former-commit-id: cb43d21243
Former-commit-id: b35f945bec [formerly c52983ab68]
Former-commit-id: 4e6fa39e5e
|
2014-06-05 15:03:11 -05:00 |
|
Fay.Liang
|
1ddb7a2b0b
|
ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7
Former-commit-id: fa2cdbfac1 [formerly d1aa160aa7] [formerly fa2cdbfac1 [formerly d1aa160aa7] [formerly c5e6daa943 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]]]
Former-commit-id: c5e6daa943
Former-commit-id: 40eeef7fd1 [formerly 39efc11cb3]
Former-commit-id: ce1e19955e
|
2014-06-05 15:49:27 -04:00 |
|
Mike Duff
|
c2751cf532
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: 28a42f3f10 [formerly 8a5acd085d] [formerly 28a42f3f10 [formerly 8a5acd085d] [formerly f5f101d416 [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]]
Former-commit-id: f5f101d416
Former-commit-id: 8e6a50e2ee [formerly 87d41ff302]
Former-commit-id: a615c41a57
|
2014-06-05 09:35:07 -05:00 |
|
brian.dyke
|
a5b2f384bf
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 2f53c2e385 [formerly 7dde6e1d04] [formerly 2f53c2e385 [formerly 7dde6e1d04] [formerly ee7c67f7b0 [formerly d7b707236a1ee3bca45dee26c10814d9e3c275c8]]]
Former-commit-id: ee7c67f7b0
Former-commit-id: 8b93c973d6 [formerly cf49a7217f]
Former-commit-id: 05f691d0cd
|
2014-05-30 10:07:12 -04:00 |
|
Matthew Howard
|
db35baefc8
|
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: 099185c960 [formerly 781d0331ab] [formerly 099185c960 [formerly 781d0331ab] [formerly 8375a2af3e [formerly def2351f527613dd62a081161e5f3a87756493ec]]]
Former-commit-id: 8375a2af3e
Former-commit-id: 11216ced25 [formerly f68748bd63]
Former-commit-id: 04c0631701
|
2014-05-29 15:54:37 -05:00 |
|
Shawn.Hooper
|
a4de244bdb
|
ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 08ad9a66cc [formerly fe567b2a5b] [formerly 08ad9a66cc [formerly fe567b2a5b] [formerly 5cf0579d20 [formerly 626ee991cd7e9dbfe52342abd9e3fd41b973f72a]]]
Former-commit-id: 5cf0579d20
Former-commit-id: 0fe034cc8b [formerly 2c476e2bb4]
Former-commit-id: 3cb14aecd9
|
2014-05-29 16:56:46 -04:00 |
|
Brian.Dyke
|
1bae94a61a
|
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: 47a37b112a [formerly b7ef9420e1] [formerly 47a37b112a [formerly b7ef9420e1] [formerly 574246b6d4 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]]
Former-commit-id: 574246b6d4
Former-commit-id: 45d59380ea [formerly 2c1fabb0f8]
Former-commit-id: 551def9f1a
|
2014-05-28 16:25:33 -04:00 |
|
Brian.Dyke
|
992186e641
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: 6f64664e70 [formerly 4c010cf27a] [formerly 6f64664e70 [formerly 4c010cf27a] [formerly ce81b44f32 [formerly b92ce0c1589c48de73387c142f1302409a3b0cb7]]]
Former-commit-id: ce81b44f32
Former-commit-id: 4f434e1bf9 [formerly 73ec45c5b2]
Former-commit-id: f5bc17ef24
|
2014-05-28 09:36:15 -04:00 |
|
Brian.Dyke
|
befec4cf01
|
CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: 089b2559bb [formerly e95ee60224] [formerly 089b2559bb [formerly e95ee60224] [formerly e852623f48 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]]]
Former-commit-id: e852623f48
Former-commit-id: f07b83ce91 [formerly b745ac5926]
Former-commit-id: 21112face5
|
2014-05-28 08:40:56 -04:00 |
|
Brian.Dyke
|
d078a2630e
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1
Former-commit-id: ea618935d0 [formerly 575cebda84] [formerly ea618935d0 [formerly 575cebda84] [formerly 638acc2c06 [formerly 34c582add16be1620f400d78d2f37da8c534f71a]]]
Former-commit-id: 638acc2c06
Former-commit-id: 2ab1fc6ddf [formerly 290b85b556]
Former-commit-id: 09f2d8b8b1
|
2014-05-27 13:42:09 -04:00 |
|
Brian.Dyke
|
7e5475923c
|
CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: 4a1b6d70c4 [formerly 89a8caddbb] [formerly 4a1b6d70c4 [formerly 89a8caddbb] [formerly ba8d7dbbb7 [formerly d57f7989982a59a546116b63a406294573844039]]]
Former-commit-id: ba8d7dbbb7
Former-commit-id: bb5d88be66 [formerly ebdd53742c]
Former-commit-id: 1a69aaf89a
|
2014-05-27 13:30:35 -04:00 |
|
Fay.Liang
|
2ac429bff7
|
ASM #596 - Watch wording not properly inserted into some warning products
Change-Id: I7dc223d95f06a6a259e969cfbb8e4bde2f4b9192
Former-commit-id: 17f1404221 [formerly c007420e22] [formerly 17f1404221 [formerly c007420e22] [formerly 4fa60f159a [formerly ed8cd169fe0a531d0d83411f7b1afe787088d406]]]
Former-commit-id: 4fa60f159a
Former-commit-id: 3ed3e2249d [formerly 5d763a0f3d]
Former-commit-id: 605c976986
|
2014-05-23 15:47:50 -04:00 |
|
Brian.Dyke
|
b0b377e811
|
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: 822ad181bf [formerly 2fd18d14d6] [formerly 822ad181bf [formerly 2fd18d14d6] [formerly db68b80bbd [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]
Former-commit-id: db68b80bbd
Former-commit-id: 937b9bb9ce [formerly ebcaebb28d]
Former-commit-id: f42d40c3a3
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
774897735a
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
Former-commit-id: 88a5ecefaa [formerly e5f951bf89] [formerly 88a5ecefaa [formerly e5f951bf89] [formerly 8c2cccb930 [formerly d9c230fbd50cc5acf1dd5c7c5e775f337de41921]]]
Former-commit-id: 8c2cccb930
Former-commit-id: bb2089f2df [formerly 89d2843610]
Former-commit-id: fe658cb381
|
2014-05-20 12:08:29 -04:00 |
|
Brian.Dyke
|
5d6603320b
|
CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: 8435ace4f8 [formerly 545e7f6ce9] [formerly 8435ace4f8 [formerly 545e7f6ce9] [formerly abf0f995cd [formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]]]
Former-commit-id: abf0f995cd
Former-commit-id: 9af8951a2a [formerly fa13621d8e]
Former-commit-id: 0f5964b03f
|
2014-05-20 11:56:30 -04:00 |
|
Brian.Dyke
|
529febf986
|
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
Former-commit-id: c2afc26206 [formerly 3183283e99] [formerly c2afc26206 [formerly 3183283e99] [formerly dcd238c6a3 [formerly 18486e2e8ead4614c05e3a7775cba95cd78053c8]]]
Former-commit-id: dcd238c6a3
Former-commit-id: 4a37cd32bd [formerly 353aebe447]
Former-commit-id: 3b7e8c2c66
|
2014-05-16 08:45:47 -04:00 |
|
Brian.Dyke
|
43210259de
|
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: 2de7de6378 [formerly b066572041] [formerly 2de7de6378 [formerly b066572041] [formerly c8f21e92fe [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]]
Former-commit-id: c8f21e92fe
Former-commit-id: 7cc4e0258d [formerly 984f56d23c]
Former-commit-id: 17d7291548
|
2014-05-15 16:40:47 -04:00 |
|
Brian.Dyke
|
33211da425
|
CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: 08f69fd3a1 [formerly 81a1affe22] [formerly 08f69fd3a1 [formerly 81a1affe22] [formerly c81d54b651 [formerly 11acfb00bda7686c68e24903df4831cf57bf86de]]]
Former-commit-id: c81d54b651
Former-commit-id: fe9ee785b6 [formerly cf4eca67af]
Former-commit-id: 77344c1e1f
|
2014-05-15 14:16:38 -04:00 |
|
Dave Hladky
|
7868ab0891
|
Issue #3168 Move DD retrieval distibution to correct feature/RPM
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: 3b544c74b6 [formerly c72be97b9b] [formerly 3b544c74b6 [formerly c72be97b9b] [formerly 783cd9e308 [formerly d94e7f139573caa508b260902870c9f745080bb8]]]
Former-commit-id: 783cd9e308
Former-commit-id: 971910f7fc [formerly 25c2dd4f7d]
Former-commit-id: 88ebc6921e
|
2014-05-14 16:13:57 -05:00 |
|
Brian.Dyke
|
1d53f6d304
|
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: f38d0138e6 [formerly 627541512d] [formerly f38d0138e6 [formerly 627541512d] [formerly d3fa10028c [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]
Former-commit-id: d3fa10028c
Former-commit-id: b0837b4905 [formerly 68f3a0169e]
Former-commit-id: f87775928f
|
2014-05-14 16:08:16 -04:00 |
|
Dave Hladky
|
cc7a9bce10
|
Issue #3168 Move retrieval distribution to correct DD RPM
Former-commit-id: 40c24180cf [formerly ca644b93ee] [formerly 40c24180cf [formerly ca644b93ee] [formerly 15366714ed [formerly 228ef1ceb7337fa38c370c3218d1c32b4f1302fb]]]
Former-commit-id: 15366714ed
Former-commit-id: f878ccb04e [formerly 268765da81]
Former-commit-id: 16a5eed943
|
2014-05-14 11:12:55 -05:00 |
|
Steve Harris
|
80d1cec3ec
|
Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
Former-commit-id: 462609aa3f [formerly c2efe26c11] [formerly 462609aa3f [formerly c2efe26c11] [formerly 70b95c7636 [formerly 2627e4d38b3dcee82dcf7a6032d692170d50d9ad]]]
Former-commit-id: 70b95c7636
Former-commit-id: 29ecfa91cb [formerly 667dff3919]
Former-commit-id: 292bb044a8
|
2014-05-13 15:23:57 -05:00 |
|
Brian.Dyke
|
4cedfadd77
|
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: 5a2e0c7e1b [formerly e95bc87a19] [formerly 5a2e0c7e1b [formerly e95bc87a19] [formerly fb4c7e55b3 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]]
Former-commit-id: fb4c7e55b3
Former-commit-id: f9474b087e [formerly 0311366ffb]
Former-commit-id: 3b7a2f1645
|
2014-05-13 11:23:55 -04:00 |
|
Steve Harris
|
82045e2409
|
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: 848519177d [formerly cf62cf4a6e] [formerly 848519177d [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: 32f255cada [formerly 233922471a]
Former-commit-id: 74a325ce74
|
2014-05-12 16:13:19 -05:00 |
|