steve.naples
|
4aae5d3a62
|
ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f
Former-commit-id: e553f0cf44 [formerly e82b0ae895] [formerly 3d75da3db0] [formerly 3d75da3db0 [formerly 66c3241bc4]] [formerly 4e959af1b4 [formerly 3d75da3db0 [formerly 66c3241bc4] [formerly 4e959af1b4 [formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]]]
Former-commit-id: 4e959af1b4
Former-commit-id: 35c3cc1f0b7914621d92705313418563b7f51fd0 [formerly 18ba10573377ee74433b2ab0bbbbc0f2efa06dea] [formerly f1c92f1e35 [formerly 3cfabd29bc]]
Former-commit-id: f1c92f1e35
Former-commit-id: dbd231a099
|
2014-07-02 15:30:48 +00:00 |
|
steve.naples
|
f9dfca5999
|
ASM #253 Update RadarBiasTableDialog to allow undo changes.
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9
Former-commit-id: 156627cf0d [formerly e994aa9482] [formerly 2a49bbda2f] [formerly 2a49bbda2f [formerly efe877d82b]] [formerly 90ed511478 [formerly 2a49bbda2f [formerly efe877d82b] [formerly 90ed511478 [formerly fcd20d35abf3617701cc797baf9ba2b3984379c8]]]]
Former-commit-id: 90ed511478
Former-commit-id: b2ebe2d78e31b3b202f763caf56debc427d03d0d [formerly f502e650f306b12ad50f762f688616a9b1039de1] [formerly 2e77b74c44 [formerly 362e1ce880]]
Former-commit-id: 2e77b74c44
Former-commit-id: b8d5f833ec
|
2014-06-24 15:52:23 +00:00 |
|
Steve Harris
|
8e58645759
|
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: 37b3b421db [formerly 869235c02a] [formerly 16f5ff0979] [formerly 16f5ff0979 [formerly b84dda5930]] [formerly 419c5f4aba [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]]
Former-commit-id: 419c5f4aba
Former-commit-id: a279361a319d31856e62ae271287fe2634f63eea [formerly dd639a780b77ef5a2f827ee961c20e9db23d2d31] [formerly af06c5a890 [formerly 66d30e59a3]]
Former-commit-id: af06c5a890
Former-commit-id: bab435f286
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
c220a11003
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 48fb810c83 [formerly e3dc97e246] [formerly be589ceb9b] [formerly be589ceb9b [formerly 399c06820a]] [formerly 8ecdd9a192 [formerly be589ceb9b [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: 00089684d6f405bf63b66585cb6f0cb2bd6fb18d [formerly 9723a25d830a41cf2e060dc218ad841643217c3e] [formerly e28febcf27 [formerly 9031f58d02]]
Former-commit-id: e28febcf27
Former-commit-id: f09000ec64
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
918b86f916
|
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: 5c0b97b76e [formerly 232d538288] [formerly 06c565d74f] [formerly 06c565d74f [formerly 30d8644fa5]] [formerly 482f915b42 [formerly 06c565d74f [formerly 30d8644fa5] [formerly 482f915b42 [formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]]]]
Former-commit-id: 482f915b42
Former-commit-id: 46307e8d1397653cec699d540ba855d45cf63fcd [formerly aa11101c8c0f5e91cdf9e5a2ddbd70bdcc0dd9a3] [formerly c1bd7a0c55 [formerly 072a4a9d63]]
Former-commit-id: c1bd7a0c55
Former-commit-id: aa70f67645
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
f006987ffc
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: ba58bbcd77 [formerly 4766b3f49f] [formerly 5064d24e26] [formerly 5064d24e26 [formerly 346bf852cd]] [formerly 81832d97e5 [formerly 5064d24e26 [formerly 346bf852cd] [formerly 81832d97e5 [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]]]
Former-commit-id: 81832d97e5
Former-commit-id: ee586f90e14b167d58641dbc7c9e583cb6604475 [formerly 4b8123012f6cebd56dd11d52a9381b3f0d930dd0] [formerly 764b729546 [formerly 4bca0769fb]]
Former-commit-id: 764b729546
Former-commit-id: ba9fb22f58
|
2014-06-13 13:21:19 -04:00 |
|
Steve Harris
|
804c0f54cd
|
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: 773379d7cb [formerly 61cb3f45b4] [formerly 3a3277c469] [formerly 3a3277c469 [formerly ad6e9fa5ee]] [formerly 9510608b74 [formerly 3a3277c469 [formerly ad6e9fa5ee] [formerly 9510608b74 [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]]]
Former-commit-id: 9510608b74
Former-commit-id: fa7385f2fb7c9674f6814c292c612da7faa9aad8 [formerly 3c82f5e3d74beb4ba9dff59b89b9c241d9fea0d9] [formerly f78bc57920 [formerly 23dea36a2c]]
Former-commit-id: f78bc57920
Former-commit-id: a18a176b4f
|
2014-06-11 12:55:44 -05:00 |
|
David Friedman
|
0043392b22
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: ab1edc5b0d [formerly 350566a514] [formerly 6d0d3f5ba5] [formerly d4d3777fd336a239a8237ede55d88b784b179a79 [formerly 6d0d3f5ba5 [formerly b8542c1332]]] [formerly 1c84c31e30 [formerly 6d0d3f5ba5 [formerly b8542c1332] [formerly 1c84c31e30 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]]]]
Former-commit-id: 1c84c31e30
Former-commit-id: 2529829eb645cd41b67c39311d40c47c15740fb7 [formerly 2134244bb7c5f6877ba479473585ac3ff2a3cceb] [formerly 0ba91c6c28 [formerly 8c8f54994b]]
Former-commit-id: 0ba91c6c28
Former-commit-id: 5d2dcfe9c8
|
2014-06-11 13:37:16 +00:00 |
|
Brian.Dyke
|
28ccd9ecc0
|
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: e46de9cb1a [formerly 7056d79f70] [formerly 0f07e14bf1] [formerly 0f07e14bf1 [formerly f72380ad60]] [formerly 9ab17ddecb [formerly 0f07e14bf1 [formerly f72380ad60] [formerly 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 57cdbcea8780144a4444063478dccb85ddbc4c69 [formerly d838e1972c1a8529e2efc996d44a235ce685e8db] [formerly 816dcf74e4 [formerly 49cd9574d9]]
Former-commit-id: 816dcf74e4
Former-commit-id: 5893782ec3
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
2c9cdbd7b6
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: f512b9c51e [formerly 64a10ce12d] [formerly ef5c74dece] [formerly ef5c74dece [formerly c1b3f9d180]] [formerly 8874d41872 [formerly ef5c74dece [formerly c1b3f9d180] [formerly 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]]
Former-commit-id: 8874d41872
Former-commit-id: 5a09a2a2fc07851b1a02ee853528cabdf2c91146 [formerly c763da54d370b72fa17bd0154f839ff80cd9226a] [formerly 4f0fc67b1f [formerly f568b5606a]]
Former-commit-id: 4f0fc67b1f
Former-commit-id: d6ebcad87e
|
2014-06-10 12:52:59 -04:00 |
|
Steve Harris
|
9828522e5c
|
Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
Former-commit-id: 22561b7e78 [formerly 483d61f414] [formerly 6e09bce335] [formerly 6e09bce335 [formerly 14370245fd]] [formerly bd98f04cde [formerly 6e09bce335 [formerly 14370245fd] [formerly bd98f04cde [formerly 65793ec4d12626b2d3365c5a0e8c3e229972b289]]]]
Former-commit-id: bd98f04cde
Former-commit-id: 2657a20700ed2baa8a82452c5ff8563d901eb5d8 [formerly 053a4d7ccdcd52fb49e7e7bdd39b7346b3706960] [formerly 2445542f10 [formerly c11a44259e]]
Former-commit-id: 2445542f10
Former-commit-id: 69d90af81f
|
2014-06-09 15:20:03 -05:00 |
|
Mike Duff
|
d64ce45dd3
|
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: ec821ebdcd [formerly b2162559fe] [formerly b876d9755a] [formerly b876d9755a [formerly 81ab64d7ff]] [formerly 39173c380c [formerly b876d9755a [formerly 81ab64d7ff] [formerly 39173c380c [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]]]]
Former-commit-id: 39173c380c
Former-commit-id: 8962160518d216decc8e0ccde5789784a0eff068 [formerly 218dced89f74bad34c2dfce78c1142304822bd73] [formerly 60fe02137f [formerly b880d171d4]]
Former-commit-id: 60fe02137f
Former-commit-id: 7316895b98
|
2014-06-06 16:03:14 -04:00 |
|
Xuezhi.Wei
|
b7e28ab359
|
ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: 597865bd7c [formerly ba05b6f16a] [formerly 81ec03e291] [formerly 81ec03e291 [formerly bdbeec662c]] [formerly 33b235a0a4 [formerly 81ec03e291 [formerly bdbeec662c] [formerly 33b235a0a4 [formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]]]]
Former-commit-id: 33b235a0a4
Former-commit-id: 5efc2abaa923f657865f07c696d74b044921c29f [formerly 4364d6d4c712093350ad1d6bb73a1c9077cfb53c] [formerly e2f7548351 [formerly 445d58699a]]
Former-commit-id: e2f7548351
Former-commit-id: 869427a96a
|
2014-06-06 17:40:09 +00:00 |
|
Juliya Dynina
|
df3c469258
|
Merge "ASM #114 - Problem with Distance Speed Tool." into asm_14.2.2
Former-commit-id: a23f4a0264 [formerly 1b61a32634] [formerly 21cd415434] [formerly 21cd415434 [formerly 80a83bd44c]] [formerly 87216a87de [formerly 21cd415434 [formerly 80a83bd44c] [formerly 87216a87de [formerly 1e1c7cbcee94e782338d440d585a3217ad606725]]]]
Former-commit-id: 87216a87de
Former-commit-id: a044281b6028eed7c610469f295f686c10c04184 [formerly 01c388eee593213b036d8a0380d954c53ca38d29] [formerly 8d89e35985 [formerly b6a4959e21]]
Former-commit-id: 8d89e35985
Former-commit-id: d807e4c657
|
2014-06-06 09:50:36 -05:00 |
|
Sean Webb
|
40f06ef646
|
Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: d167fa04e4 [formerly 52283357c8] [formerly e0f9eabb45] [formerly e0f9eabb45 [formerly 016648ffaf]] [formerly cb43d21243 [formerly e0f9eabb45 [formerly 016648ffaf] [formerly cb43d21243 [formerly 5556e19903965bea22ca2f11b51fcc1c95cb07f8]]]]
Former-commit-id: cb43d21243
Former-commit-id: fd7366ae96ad44d0f3d8ed1f1e6a4a1436c266e4 [formerly 4706f754c942852a68f343f015e6e1efe8ea3f83] [formerly b35f945bec [formerly c52983ab68]]
Former-commit-id: b35f945bec
Former-commit-id: b196247c36
|
2014-06-05 15:03:11 -05:00 |
|
Fay.Liang
|
9ee7815eca
|
ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7
Former-commit-id: 1642b5ad69 [formerly 46926b679d] [formerly fa2cdbfac1] [formerly fa2cdbfac1 [formerly d1aa160aa7]] [formerly c5e6daa943 [formerly fa2cdbfac1 [formerly d1aa160aa7] [formerly c5e6daa943 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]]]]
Former-commit-id: c5e6daa943
Former-commit-id: b58f7e5dbe7d73c3c2a5d064510182c289101fa6 [formerly 03458502710ffda685e54402a1e36d9e18ebbf95] [formerly 40eeef7fd1 [formerly 39efc11cb3]]
Former-commit-id: 40eeef7fd1
Former-commit-id: 4c11888976
|
2014-06-05 15:49:27 -04:00 |
|
Mike Duff
|
d4e7854db3
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: 69ea8c6dc0 [formerly 3a3928cde3] [formerly 28a42f3f10] [formerly 28a42f3f10 [formerly 8a5acd085d]] [formerly f5f101d416 [formerly 28a42f3f10 [formerly 8a5acd085d] [formerly f5f101d416 [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]]]
Former-commit-id: f5f101d416
Former-commit-id: 3698559f84cf720c566507aa3243295e130e77b0 [formerly 63be3054ca051657de6e1a1480a28374ac8bc854] [formerly 8e6a50e2ee [formerly 87d41ff302]]
Former-commit-id: 8e6a50e2ee
Former-commit-id: e89e9975c5
|
2014-06-05 09:35:07 -05:00 |
|
Michael Gamazaychikov
|
0ec2896a37
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: 9c8ea9175b [formerly efd0fb50b8] [formerly e5a9fa0827] [formerly e5a9fa0827 [formerly c07bcacbf8]] [formerly 50ab77046b [formerly e5a9fa0827 [formerly c07bcacbf8] [formerly 50ab77046b [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]]
Former-commit-id: 50ab77046b
Former-commit-id: b40093b9faa61b20a9a359277a1abd5814e2eb35 [formerly a99f478987db9b40c18652f3f209154a8dfc3177] [formerly a2423cfadc [formerly 5efb82ea3e]]
Former-commit-id: a2423cfadc
Former-commit-id: fc5acb6bcb
|
2014-06-05 13:43:04 +01:00 |
|
Zhidong.Hao
|
2f9dd94b32
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 32c623ab36 [formerly 43e1a5a909] [formerly ccbda4db4f] [formerly cd745cfccf9753e7f39acce17dd85caf4512bba9 [formerly ccbda4db4f [formerly 26c6801620]]] [formerly 71ab6b9ed0 [formerly ccbda4db4f [formerly 26c6801620] [formerly 71ab6b9ed0 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]]]
Former-commit-id: 71ab6b9ed0
Former-commit-id: a97817d6e623293e125b572eeef60377a2d5ed84 [formerly c17aa2176430d3a612529390ab4b68f86ac03181] [formerly 9094e822e0 [formerly e5c47a51eb]]
Former-commit-id: 9094e822e0
Former-commit-id: 460b543c6d
|
2014-06-03 11:55:32 -04:00 |
|
brian.dyke
|
a94a22d93a
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: edbd578a6b [formerly e1f9c919e6] [formerly 2f53c2e385] [formerly 2f53c2e385 [formerly 7dde6e1d04]] [formerly ee7c67f7b0 [formerly 2f53c2e385 [formerly 7dde6e1d04] [formerly ee7c67f7b0 [formerly d7b707236a1ee3bca45dee26c10814d9e3c275c8]]]]
Former-commit-id: ee7c67f7b0
Former-commit-id: 140d1359f08a6f39d3743304502b2c21e3bfe161 [formerly 5b345e8fad1dba7b952e789980e9a6f6873f05eb] [formerly 8b93c973d6 [formerly cf49a7217f]]
Former-commit-id: 8b93c973d6
Former-commit-id: b2b232c2cc
|
2014-05-30 10:07:12 -04:00 |
|
Matthew Howard
|
fa6bfc36cf
|
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: f56a7363c8 [formerly d0880003a6] [formerly 099185c960] [formerly 099185c960 [formerly 781d0331ab]] [formerly 8375a2af3e [formerly 099185c960 [formerly 781d0331ab] [formerly 8375a2af3e [formerly def2351f527613dd62a081161e5f3a87756493ec]]]]
Former-commit-id: 8375a2af3e
Former-commit-id: f3550e2053ebdf50b9cc3fd74bd334ad8a4179b4 [formerly d46f8a355df86411c1f5283003df72a741dbec12] [formerly 11216ced25 [formerly f68748bd63]]
Former-commit-id: 11216ced25
Former-commit-id: b7f3c5798e
|
2014-05-29 15:54:37 -05:00 |
|
Shawn.Hooper
|
c86c6c7a5e
|
ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 497f09b8ff [formerly 4de35d0a2b] [formerly 08ad9a66cc] [formerly 3afa9be0d4af37fe0d3960705ea8f3071213440f [formerly 08ad9a66cc [formerly fe567b2a5b]]] [formerly 5cf0579d20 [formerly 08ad9a66cc [formerly fe567b2a5b] [formerly 5cf0579d20 [formerly 626ee991cd7e9dbfe52342abd9e3fd41b973f72a]]]]
Former-commit-id: 5cf0579d20
Former-commit-id: 163b579bad9d06939490803207681a155f895e08 [formerly 1363ea6a68426295d8f737eab6b4aff6d84a7400] [formerly 0fe034cc8b [formerly 2c476e2bb4]]
Former-commit-id: 0fe034cc8b
Former-commit-id: 94ec109216
|
2014-05-29 16:56:46 -04:00 |
|
Steve Harris
|
5519f0463f
|
Merge branch 'master_14.2.2' (14.2.2-9,10,11) into omaha_14.2.2
Former-commit-id: c8ab465357 [formerly 74b0099fdf] [formerly 53645445fe] [formerly 53645445fe [formerly c7ef7878f5]] [formerly 9313e045bf [formerly 53645445fe [formerly c7ef7878f5] [formerly 9313e045bf [formerly 03b376033b3374694bc8a6e0a2c55b830db058e1]]]]
Former-commit-id: 9313e045bf
Former-commit-id: 6ad7d4ce0b4e6b01ac241717c456a509cedfa8c6 [formerly 67033e82aff16def433329064a8788daafb7920f] [formerly 947d44c945 [formerly e92b927c5a]]
Former-commit-id: 947d44c945
Former-commit-id: 774a5c516c
|
2014-05-29 07:45:24 -05:00 |
|
Brian.Dyke
|
5778faa16a
|
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: 36dc7d1e9d [formerly 9e0cf9b945] [formerly 47a37b112a] [formerly 47a37b112a [formerly b7ef9420e1]] [formerly 574246b6d4 [formerly 47a37b112a [formerly b7ef9420e1] [formerly 574246b6d4 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]]]
Former-commit-id: 574246b6d4
Former-commit-id: c2d135d753b49c4cf96c32b53fe8f647c1f326e9 [formerly 8dc10058004612f82f3168b336f93c36d1945933] [formerly 45d59380ea [formerly 2c1fabb0f8]]
Former-commit-id: 45d59380ea
Former-commit-id: 7d8cb95e95
|
2014-05-28 16:25:33 -04:00 |
|
Brian.Dyke
|
2141617d41
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: 1bba2340c9 [formerly 0fe87c550c] [formerly 6f64664e70] [formerly 6f64664e70 [formerly 4c010cf27a]] [formerly ce81b44f32 [formerly 6f64664e70 [formerly 4c010cf27a] [formerly ce81b44f32 [formerly b92ce0c1589c48de73387c142f1302409a3b0cb7]]]]
Former-commit-id: ce81b44f32
Former-commit-id: 1fee2f0d1df61fe0c3d591fb71ea95ca9714ee16 [formerly 1509b1f949c311ae098b3a9a2397fccd0508dc1c] [formerly 4f434e1bf9 [formerly 73ec45c5b2]]
Former-commit-id: 4f434e1bf9
Former-commit-id: 90a397bd7e
|
2014-05-28 09:36:15 -04:00 |
|
Brian.Dyke
|
680bd1590f
|
CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: 6d59ee458c [formerly fba5604613] [formerly 089b2559bb] [formerly 089b2559bb [formerly e95ee60224]] [formerly e852623f48 [formerly 089b2559bb [formerly e95ee60224] [formerly e852623f48 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]]]]
Former-commit-id: e852623f48
Former-commit-id: 8fc919202642293647c554812f02a992f191c215 [formerly e2442f94c9c8f1691bd70abcf54b5b626473d3de] [formerly f07b83ce91 [formerly b745ac5926]]
Former-commit-id: f07b83ce91
Former-commit-id: 4400514725
|
2014-05-28 08:40:56 -04:00 |
|
Brian.Dyke
|
70972cb68d
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1
Former-commit-id: 41fa291585 [formerly f3b0bdff29] [formerly ea618935d0] [formerly ea618935d0 [formerly 575cebda84]] [formerly 638acc2c06 [formerly ea618935d0 [formerly 575cebda84] [formerly 638acc2c06 [formerly 34c582add16be1620f400d78d2f37da8c534f71a]]]]
Former-commit-id: 638acc2c06
Former-commit-id: bea61a15483b1ffcd627505a63f7fd2efcd8bbd6 [formerly 05ba75929061ec2ce7acb3c93b8c5d42ef107834] [formerly 2ab1fc6ddf [formerly 290b85b556]]
Former-commit-id: 2ab1fc6ddf
Former-commit-id: f30eefeda4
|
2014-05-27 13:42:09 -04:00 |
|
Brian.Dyke
|
a6b1243504
|
CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: 55c3935253 [formerly 86eefc2026] [formerly 4a1b6d70c4] [formerly 4a1b6d70c4 [formerly 89a8caddbb]] [formerly ba8d7dbbb7 [formerly 4a1b6d70c4 [formerly 89a8caddbb] [formerly ba8d7dbbb7 [formerly d57f7989982a59a546116b63a406294573844039]]]]
Former-commit-id: ba8d7dbbb7
Former-commit-id: 7f6a4475b8e771a24c79f899af5cee35c8b087af [formerly ddbd59370c87b39e43f9f08800b6f899c79a9f83] [formerly bb5d88be66 [formerly ebdd53742c]]
Former-commit-id: bb5d88be66
Former-commit-id: 90cf8cd426
|
2014-05-27 13:30:35 -04:00 |
|
Fay.Liang
|
b1eca3e35f
|
ASM #596 - Watch wording not properly inserted into some warning products
Change-Id: I7dc223d95f06a6a259e969cfbb8e4bde2f4b9192
Former-commit-id: b96e422515 [formerly 61c177c7b2] [formerly 17f1404221] [formerly 17f1404221 [formerly c007420e22]] [formerly 4fa60f159a [formerly 17f1404221 [formerly c007420e22] [formerly 4fa60f159a [formerly ed8cd169fe0a531d0d83411f7b1afe787088d406]]]]
Former-commit-id: 4fa60f159a
Former-commit-id: bff421431880a825a8299a5babc150f0c76e02ad [formerly 8d8e3635fce79ec738b4c75ee9ff6d33751dd44e] [formerly 3ed3e2249d [formerly 5d763a0f3d]]
Former-commit-id: 3ed3e2249d
Former-commit-id: 5e77392ab7
|
2014-05-23 15:47:50 -04:00 |
|
Steve Harris
|
3e9ec90ad6
|
Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
Former-commit-id: 799146cb25 [formerly 7b9e17582c] [formerly 1e34c7eda3] [formerly 1e34c7eda3 [formerly 3ed42be350]] [formerly acecfd7dfa [formerly 1e34c7eda3 [formerly 3ed42be350] [formerly acecfd7dfa [formerly a125cbc03cc5cace25e35b3516c34f9d7060a78e]]]]
Former-commit-id: acecfd7dfa
Former-commit-id: 8ce5cecffc5704ce3d6e4d18e49128dbc69d7b3a [formerly 6822edbc09ceb4a447389a31731027b78a6cf212] [formerly efafb08e74 [formerly fdaf7083f5]]
Former-commit-id: efafb08e74
Former-commit-id: 90b1631c3a
|
2014-05-22 13:52:02 -05:00 |
|
brian.dyke
|
7ca1d128c0
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: c39e95319a [formerly ed62e77a57] [formerly f405e8c89c] [formerly f405e8c89c [formerly 562f53874a]] [formerly f74b1707f9 [formerly f405e8c89c [formerly 562f53874a] [formerly f74b1707f9 [formerly 59ff65f9d31cef6549ea8912adceb9ed4c7d11f6]]]]
Former-commit-id: f74b1707f9
Former-commit-id: ff6a4aaf77bcf4afb80a540f7fd523f261d3d90a [formerly 3a90970de36c174b3d02e2cc523d82dcac4a7768] [formerly ab985767bd [formerly 69a4d1e3b9]]
Former-commit-id: ab985767bd
Former-commit-id: a4ade097f7
|
2014-05-22 12:46:56 -04:00 |
|
Michael Gamazaychikov
|
f68a237e53
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: 4c1074cd34 [formerly b3d76892d1] [formerly 8ae5d535de] [formerly 8ae5d535de [formerly 63409ef272]] [formerly 5bff9f2ac8 [formerly 8ae5d535de [formerly 63409ef272] [formerly 5bff9f2ac8 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]]]
Former-commit-id: 5bff9f2ac8
Former-commit-id: de86e857178734353fddc8c8ca7cbe90cd21da1b [formerly 3f60fc9aefaa49ce841bebfd87ef42af677038af] [formerly 0d38d04dad [formerly 134f486069]]
Former-commit-id: 0d38d04dad
Former-commit-id: b499ee2828
|
2014-05-21 15:12:08 +01:00 |
|
Brian.Dyke
|
00666a6e2b
|
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: 437909ad37 [formerly 5afaee3d33] [formerly 822ad181bf] [formerly 822ad181bf [formerly 2fd18d14d6]] [formerly db68b80bbd [formerly 822ad181bf [formerly 2fd18d14d6] [formerly db68b80bbd [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]]
Former-commit-id: db68b80bbd
Former-commit-id: 19a96840f5cc736aaa392becfeae663fce60ffe5 [formerly 6fbbfc0267046011d5fd8ba4c15aa6b2ab182188] [formerly 937b9bb9ce [formerly ebcaebb28d]]
Former-commit-id: 937b9bb9ce
Former-commit-id: 5a07e9c984
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
4a81606fd7
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
Former-commit-id: 99a4c7412e [formerly 9426ddb9a9] [formerly 88a5ecefaa] [formerly 88a5ecefaa [formerly e5f951bf89]] [formerly 8c2cccb930 [formerly 88a5ecefaa [formerly e5f951bf89] [formerly 8c2cccb930 [formerly d9c230fbd50cc5acf1dd5c7c5e775f337de41921]]]]
Former-commit-id: 8c2cccb930
Former-commit-id: eb1582d1e9dcb717f67223f721b51303baf72734 [formerly a2965f6fcb55c7bf469752a36f14c13683c6f1bd] [formerly bb2089f2df [formerly 89d2843610]]
Former-commit-id: bb2089f2df
Former-commit-id: 7b6988aa0b
|
2014-05-20 12:08:29 -04:00 |
|
Brian.Dyke
|
13567125ac
|
CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: d5690e200a [formerly c9ef80beeb] [formerly 8435ace4f8] [formerly 8435ace4f8 [formerly 545e7f6ce9]] [formerly abf0f995cd [formerly 8435ace4f8 [formerly 545e7f6ce9] [formerly abf0f995cd [formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]]]]
Former-commit-id: abf0f995cd
Former-commit-id: 143c82f87898bc530e5c0226e199df64c9f98b4e [formerly af49ed0701c5a48e77ad4fbbb9da056ebd4f6592] [formerly 9af8951a2a [formerly fa13621d8e]]
Former-commit-id: 9af8951a2a
Former-commit-id: 1f0f7de4c5
|
2014-05-20 11:56:30 -04:00 |
|
Brian.Dyke
|
be50b48b23
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
Former-commit-id: d2187cf068 [formerly 432e5f15a5] [formerly c4b7b8dd74] [formerly c4b7b8dd74 [formerly dbd3bb54e8]] [formerly d5a4669fc4 [formerly c4b7b8dd74 [formerly dbd3bb54e8] [formerly d5a4669fc4 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]]]
Former-commit-id: d5a4669fc4
Former-commit-id: 30601406aced68ed1dbef81b1e145588782f0d0b [formerly 9eb0d56ad4743d868045273e945e80f0d2e0674f] [formerly f2885c9996 [formerly f30bd7d9ae]]
Former-commit-id: f2885c9996
Former-commit-id: f113398a16
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
b9524956ec
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: c04d468def [formerly 75f7d77c45] [formerly 2eae2be646] [formerly 2eae2be646 [formerly b29db01a59]] [formerly 06c2478539 [formerly 2eae2be646 [formerly b29db01a59] [formerly 06c2478539 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]]]
Former-commit-id: 06c2478539
Former-commit-id: 3f5087f93e046653e4a938c287448644b3cfbccb [formerly 8d732a149cd7483006dfc9f0e4e9c03c2adcc03f] [formerly 3558d8f162 [formerly 9baa09f4bc]]
Former-commit-id: 3558d8f162
Former-commit-id: 534d211494
|
2014-05-19 13:26:45 -04:00 |
|
Gang.Zhang
|
9da505435f
|
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 71fb9efda3 [formerly 98e50ae694] [formerly 6e034005e0] [formerly 6e034005e0 [formerly 94fea6748f]] [formerly 9c1587b92d [formerly 6e034005e0 [formerly 94fea6748f] [formerly 9c1587b92d [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]]]]
Former-commit-id: 9c1587b92d
Former-commit-id: 85c92def54c7346896b5b5c892448c23aef7ddda [formerly cf5b27d037d8ebdd2e427efe07f404e425a82240] [formerly ec6053c3f7 [formerly baa1546e39]]
Former-commit-id: ec6053c3f7
Former-commit-id: 03dfdaffd4
|
2014-05-19 15:40:41 +01:00 |
|
Brian.Dyke
|
197957e0d9
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: faa1b13d5a [formerly a9f2fdb086] [formerly 509616ba6a] [formerly 509616ba6a [formerly f8ed9c7944]] [formerly e9bd17a21f [formerly 509616ba6a [formerly f8ed9c7944] [formerly e9bd17a21f [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]]]
Former-commit-id: e9bd17a21f
Former-commit-id: 7ac99f155639a9ee2f66e5a565e5025004d7f994 [formerly d77fe7357769ccd29689730a70de23400e90fee7] [formerly e563eb3376 [formerly 409a48b907]]
Former-commit-id: e563eb3376
Former-commit-id: 3772c8d2bf
|
2014-05-19 07:55:42 -04:00 |
|
David Friedman
|
1668636171
|
Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
Former-commit-id: 75d7f3e42a [formerly 99edfe0a17] [formerly a920c5a5e4] [formerly a920c5a5e4 [formerly c909746e0e]] [formerly a55e851780 [formerly a920c5a5e4 [formerly c909746e0e] [formerly a55e851780 [formerly a4c1c5524c31384c3532076ee151fd9a294367d2]]]]
Former-commit-id: a55e851780
Former-commit-id: ca2e9532cc17b9a287d8f63275e44f0464a80cb4 [formerly bee35b0f50c15c2acee4d04f32450273a1e35f20] [formerly f8c9026f79 [formerly 101f43d875]]
Former-commit-id: f8c9026f79
Former-commit-id: 57712d2038
|
2014-05-16 16:40:38 -05:00 |
|
David Friedman
|
53829c16ec
|
ASM #240 - RPS lists delivered by awips2-rcm out of date
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb
Former-commit-id: 259fd91bf5 [formerly a13190aeb9] [formerly b462660d75] [formerly b462660d75 [formerly caa38ec709]] [formerly eab9a6b6d7 [formerly b462660d75 [formerly caa38ec709] [formerly eab9a6b6d7 [formerly 880c5d7259a5af17f2452fa3bd9f18d852c81d82]]]]
Former-commit-id: eab9a6b6d7
Former-commit-id: 4b3799c1d9c5d3a373dc17352b1a0fcc7634387b [formerly 5fa6cc8307089b8f052ac6ad0cfa79f0362dc0ab] [formerly 81abf8e7d9 [formerly 4efaa47d2d]]
Former-commit-id: 81abf8e7d9
Former-commit-id: d06f8def65
|
2014-05-16 21:38:34 +00:00 |
|
David Friedman
|
cf7c557b47
|
ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5
Former-commit-id: fd6d69b030 [formerly 39e412aac8] [formerly 404f3af49e] [formerly 404f3af49e [formerly 1503bc4162]] [formerly 3b69a240c8 [formerly 404f3af49e [formerly 1503bc4162] [formerly 3b69a240c8 [formerly 4fd6bbfba29a39bf125269ab8342b826995e3d86]]]]
Former-commit-id: 3b69a240c8
Former-commit-id: e4fefd422be4ff8fd894fe565e65be7e417f3426 [formerly ab442fed2bdf78f10c432839c809a8791bac6aed] [formerly ff0f8e731f [formerly b62ac936ba]]
Former-commit-id: ff0f8e731f
Former-commit-id: 3a6e887a7c
|
2014-05-16 21:34:59 +00:00 |
|
Brian.Dyke
|
3e4c7b715a
|
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
Former-commit-id: 3a06a02d76 [formerly 99e1c53457] [formerly c2afc26206] [formerly c2afc26206 [formerly 3183283e99]] [formerly dcd238c6a3 [formerly c2afc26206 [formerly 3183283e99] [formerly dcd238c6a3 [formerly 18486e2e8ead4614c05e3a7775cba95cd78053c8]]]]
Former-commit-id: dcd238c6a3
Former-commit-id: af1dd8b630c8c8e4649352456938255b629e7292 [formerly ec4e89f93aee5394b38539a722d1331582a6eb6f] [formerly 4a37cd32bd [formerly 353aebe447]]
Former-commit-id: 4a37cd32bd
Former-commit-id: fb776b4091
|
2014-05-16 08:45:47 -04:00 |
|
Brian.Dyke
|
3d5dbe1231
|
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: fd60ea9187 [formerly f9a40a24e3] [formerly 2de7de6378] [formerly 2de7de6378 [formerly b066572041]] [formerly c8f21e92fe [formerly 2de7de6378 [formerly b066572041] [formerly c8f21e92fe [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]]]
Former-commit-id: c8f21e92fe
Former-commit-id: bc2b3d4aa018e8c0fe80b840937c3514597d8770 [formerly 24586b50613dc8d4739299b6e8346907dcc7c9c1] [formerly 7cc4e0258d [formerly 984f56d23c]]
Former-commit-id: 7cc4e0258d
Former-commit-id: fc476a1286
|
2014-05-15 16:40:47 -04:00 |
|
Brian.Dyke
|
9b7c35c41a
|
CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: e2a6e2aae9 [formerly ac7b375d91] [formerly 08f69fd3a1] [formerly 08f69fd3a1 [formerly 81a1affe22]] [formerly c81d54b651 [formerly 08f69fd3a1 [formerly 81a1affe22] [formerly c81d54b651 [formerly 11acfb00bda7686c68e24903df4831cf57bf86de]]]]
Former-commit-id: c81d54b651
Former-commit-id: 2b132695666abcc69001d2f23abe6454a89eedfe [formerly ba771ce0e5ca8e2a54ee28250070016a434fb6dc] [formerly fe9ee785b6 [formerly cf4eca67af]]
Former-commit-id: fe9ee785b6
Former-commit-id: cc09a85660
|
2014-05-15 14:16:38 -04:00 |
|
Steve Harris
|
9cd68e9f00
|
Merge branch 'master_14.2.2' (14.2.2-9) into omaha_14.2.2
Former-commit-id: fcf7fd9e44 [formerly e05747f71e] [formerly 01a6ce5b9b] [formerly 5e934f7789435bd0a66e1f4e920092120712da9f [formerly 01a6ce5b9b [formerly 85850ed33e]]] [formerly a6aa34210c [formerly 01a6ce5b9b [formerly 85850ed33e] [formerly a6aa34210c [formerly b1bf5bdc4a81c55c9cd30ac77857509a2e8f5a08]]]]
Former-commit-id: a6aa34210c
Former-commit-id: 2db51920e90d0ba1b3260db576cc2ccc7bf71d7c [formerly 09d30738acbd13c4f3f0780bc4acb3c739421998] [formerly 9496e2ccdc [formerly 0ebb502663]]
Former-commit-id: 9496e2ccdc
Former-commit-id: 758f07fea0
|
2014-05-15 08:12:49 -05:00 |
|
Dave Hladky
|
03b8f03bbe
|
Issue #3168 Move DD retrieval distibution to correct feature/RPM
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: eaff2877f8 [formerly 0e73a4d2a8] [formerly 3b544c74b6] [formerly 3b544c74b6 [formerly c72be97b9b]] [formerly 783cd9e308 [formerly 3b544c74b6 [formerly c72be97b9b] [formerly 783cd9e308 [formerly d94e7f139573caa508b260902870c9f745080bb8]]]]
Former-commit-id: 783cd9e308
Former-commit-id: d624132e008b5c6671ef05840f10335ed66e54ba [formerly 86951af90c14b8faa6f0c72f4a63cc9c73be2211] [formerly 971910f7fc [formerly 25c2dd4f7d]]
Former-commit-id: 971910f7fc
Former-commit-id: 8248c69492
|
2014-05-14 16:13:57 -05:00 |
|
Brian.Dyke
|
1a8022b1fa
|
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: 1ec3cb3aff [formerly 8c0709798d] [formerly f38d0138e6] [formerly f38d0138e6 [formerly 627541512d]] [formerly d3fa10028c [formerly f38d0138e6 [formerly 627541512d] [formerly d3fa10028c [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]]
Former-commit-id: d3fa10028c
Former-commit-id: 2fe61d5a5b2332b3f7e0bd8e4af00bc1dda93a77 [formerly 91d88625eae6852df94fbb04133d89826c605aad] [formerly b0837b4905 [formerly 68f3a0169e]]
Former-commit-id: b0837b4905
Former-commit-id: a6b42a776b
|
2014-05-14 16:08:16 -04:00 |
|
Shawn Hooper
|
e460225cd6
|
Merge "ASM #560 - LDM 6.11.5 GRIB library causing crash Modified Release number in component.spce from 10 to 11" into asm_14.2.2
Former-commit-id: 2554704ad3 [formerly 183109f238] [formerly 3143b15d26] [formerly 3143b15d26 [formerly 2fe0c47c6d]] [formerly 24918bda30 [formerly 3143b15d26 [formerly 2fe0c47c6d] [formerly 24918bda30 [formerly b774242fcff4bf603b82c8a6657e372d8bdc3c19]]]]
Former-commit-id: 24918bda30
Former-commit-id: b146723226611dea6491b15619e99d50ff68b07d [formerly 09fb99b46539c0e3080552d805df6a73630991ad] [formerly 93977713d5 [formerly e70f2dd6fa]]
Former-commit-id: 93977713d5
Former-commit-id: 5c85790b1a
|
2014-05-14 14:39:57 -05:00 |
|
Dave Hladky
|
72908bceaa
|
Issue #3168 Move retrieval distribution to correct DD RPM
Former-commit-id: 4f1e268efc [formerly 6a80ab5dfb] [formerly 40c24180cf] [formerly 40c24180cf [formerly ca644b93ee]] [formerly 15366714ed [formerly 40c24180cf [formerly ca644b93ee] [formerly 15366714ed [formerly 228ef1ceb7337fa38c370c3218d1c32b4f1302fb]]]]
Former-commit-id: 15366714ed
Former-commit-id: 4f66837c03245eab0306d688d185f84e123bc33c [formerly 45e1e810677500f358f651b3e5c5e4eb36b9a380] [formerly f878ccb04e [formerly 268765da81]]
Former-commit-id: f878ccb04e
Former-commit-id: 02b2c05d0f
|
2014-05-14 11:12:55 -05:00 |
|