Mark Peters
|
ba47bfd846
|
Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e
Former-commit-id: 41a0fa9bfe [formerly dc27d9252c] [formerly 3464751716] [formerly 41a0fa9bfe [formerly dc27d9252c] [formerly 3464751716] [formerly 5ed537572a [formerly 3464751716 [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]]]]
Former-commit-id: 5ed537572a
Former-commit-id: e66adcd8ff [formerly 82e2a2bbb5] [formerly e8adb61acc7a249cc87878a153cb4b17d34bf566 [formerly c50ae98b5f]]
Former-commit-id: eab6b7d95d209e071ff8f9cbfcee197abb9ff1a3 [formerly c2173b1925]
Former-commit-id: dffbaa684d
|
2014-10-07 11:42:44 -05:00 |
|
Brian Clements
|
0bfcdec3d4
|
Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407
Former-commit-id: caaf7f9723 [formerly 2637d1b07f] [formerly 773619f741] [formerly caaf7f9723 [formerly 2637d1b07f] [formerly 773619f741] [formerly ec37971eff [formerly 773619f741 [formerly a758b7aff6b30194a3180fddffcefa5d019f2ee5]]]]
Former-commit-id: ec37971eff
Former-commit-id: 65e1114f26 [formerly 67bece24d4] [formerly f7a65a072cadad5df1bf6f1cd57ad81fe808004f [formerly c964fb1e80]]
Former-commit-id: 728fb5fa3a6f593dbe3aaa7dfd1eb72f5ccd01b3 [formerly c148e3e56f]
Former-commit-id: eda2463f7e
|
2014-10-07 10:43:47 -05:00 |
|
Nate Jensen
|
94f99ada47
|
Merge "Issue #3686 fix kml export when maps are the only thing loaded" into omaha_14.3.1
Former-commit-id: 31f3bb414f [formerly 9c95c255c2] [formerly ef6da2a181] [formerly 31f3bb414f [formerly 9c95c255c2] [formerly ef6da2a181] [formerly b2dcfdf572 [formerly ef6da2a181 [formerly 03ed17c8994b00ea37c1c591760c9b7c452dfcde]]]]
Former-commit-id: b2dcfdf572
Former-commit-id: 66a1c74989 [formerly 3caa2b3a21] [formerly 95af3f6b0b6efaecfa4c81a4a2a352015c7af4ed [formerly 58c8b04318]]
Former-commit-id: 3264102321c0ee2360649a60b79682d788af067e [formerly 41729296aa]
Former-commit-id: 2bb8579c76
|
2014-10-06 15:53:19 -05:00 |
|
Nate Jensen
|
f55b993e2b
|
Issue #3686 fix kml export when maps are the only thing loaded
Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0
Former-commit-id: 1a4569eaef [formerly f8278a9ad3] [formerly 446e0bcdf6] [formerly 1a4569eaef [formerly f8278a9ad3] [formerly 446e0bcdf6] [formerly 9025e166dd [formerly 446e0bcdf6 [formerly 9dac0fcf997feeecdd8c581ae8fd72581c32d095]]]]
Former-commit-id: 9025e166dd
Former-commit-id: 7b982b0833 [formerly 06d562092d] [formerly be3094a4b7146ccbb7a91092d58b8513482d6d19 [formerly 00adad9546]]
Former-commit-id: 0b8665364577af24ca355547bb5dd0507d2c317f [formerly 7d4f951822]
Former-commit-id: 3c4e7bc755
|
2014-10-06 15:41:42 -05:00 |
|
Roger Ferrel
|
1eb7f14c99
|
Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: 50982e8160 [formerly 2f8d5263b9] [formerly dfbf07f377] [formerly 50982e8160 [formerly 2f8d5263b9] [formerly dfbf07f377] [formerly d4ef865375 [formerly dfbf07f377 [formerly be87967bf65bc07af5f89c13bf4cfd8eff9b4db6]]]]
Former-commit-id: d4ef865375
Former-commit-id: ecec042861 [formerly 05c00c7bc7] [formerly cb42eace946af5e6c4a04a8e522489b3f209954f [formerly 96f484e323]]
Former-commit-id: 9ad6c12354950dd916b1af65b9e0a613b027237b [formerly 7afe6d2df6]
Former-commit-id: 861da21f34
|
2014-10-06 15:34:30 -05:00 |
|
Michael Gamazaychikov
|
12b346f811
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410
Former-commit-id: 74c03e5b81 [formerly 3851e4c961] [formerly f0b644d92e] [formerly 74c03e5b81 [formerly 3851e4c961] [formerly f0b644d92e] [formerly e6d3baaa9c [formerly f0b644d92e [formerly dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463]]]]
Former-commit-id: e6d3baaa9c
Former-commit-id: c338697738 [formerly a2c89ea11c] [formerly 7008af67fcd8171a0d155c064f558b3a2f7043fe [formerly 4613f0e9d1]]
Former-commit-id: e8740668a7325fb0966a81adfd4a9857c2f48201 [formerly 63f3558f48]
Former-commit-id: 488cf033a9
|
2014-10-06 15:32:10 -04:00 |
|
Steve Harris
|
cf73096716
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 53dc9657e2 [formerly 06a27b2d3c] [formerly 39c5e9c314] [formerly 53dc9657e2 [formerly 06a27b2d3c] [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]]
Former-commit-id: 2db03d95b3
Former-commit-id: ca63a8cfc3 [formerly bcf1265a16] [formerly 4363db305e76ae3a50e019f510a7b919ebc7230e [formerly 3542caf090]]
Former-commit-id: 0522d4db8f9331e9bfd83cc7147290634159c673 [formerly cfd49c8ca0]
Former-commit-id: afd3d3fa2d
|
2014-10-06 13:57:59 -05:00 |
|
Nate Jensen
|
50d26f0da8
|
Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: 054947764c [formerly 71efead2db] [formerly 87d80afd0b] [formerly 054947764c [formerly 71efead2db] [formerly 87d80afd0b] [formerly de8b9cf0b8 [formerly 87d80afd0b [formerly 45140e7bd5ac2dcc51351d74dc87119aeac98f3b]]]]
Former-commit-id: de8b9cf0b8
Former-commit-id: 102a1f5c5b [formerly bfd4adcf63] [formerly eae87fcb1695bde68ef1e3bcb6269a6800c5953c [formerly e7c6cf60d5]]
Former-commit-id: b4e87d05085f2a52fa58791b6b3f2601d490818c [formerly 12ecb3b68a]
Former-commit-id: 47a9b16164
|
2014-10-06 11:37:54 -05:00 |
|
Nate Jensen
|
a7ed20921b
|
Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1
Former-commit-id: f35c95de02 [formerly b544abb498] [formerly baec32be20] [formerly f35c95de02 [formerly b544abb498] [formerly baec32be20] [formerly 23c5ea21e4 [formerly baec32be20 [formerly 73be758f4ae461539c4a622cf52b7bc73705fc50]]]]
Former-commit-id: 23c5ea21e4
Former-commit-id: 015c694d2f [formerly 3941281bb0] [formerly 7e9e75b3708abb852b52c881df4127de3e856477 [formerly 88afde5dfa]]
Former-commit-id: 43e8eb44fa4a566ec838fb8744a8301569eb65d6 [formerly fe4e43d8d3]
Former-commit-id: f623152a9c
|
2014-10-06 09:07:38 -05:00 |
|
Brian.Dyke
|
d8ccd40588
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 5da2026d2b [formerly 85d83aefe0] [formerly f440da9c70] [formerly 5da2026d2b [formerly 85d83aefe0] [formerly f440da9c70] [formerly 92762f46c7 [formerly f440da9c70 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]]]
Former-commit-id: 92762f46c7
Former-commit-id: beb7a3f448 [formerly 64aef1a783] [formerly 6e5ec5380fe3992e157472559b5e85f288b4b251 [formerly 4dbdf9de26]]
Former-commit-id: d771453098f05cdadd94113c1504ef71db5e8e6b [formerly 91f89ee1f6]
Former-commit-id: 918de34464
|
2014-10-03 14:04:46 -04:00 |
|
Steve Harris
|
e40f190f9a
|
Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
Issue #3648:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Issue #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
Also modified with the resolution of #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java
Former-commit-id: fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly 2616fe04b6 [formerly da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 1c1e618183 [formerly 306826aed9] [formerly 97756f4cc415dba80b72fef671c8609b2b0ef779 [formerly 523cedbb56]]
Former-commit-id: 85a2c5f56cad1fa8121856b8cb5312cdf481051b [formerly 57f5294f08]
Former-commit-id: e05d31ae36
|
2014-10-03 10:18:34 -05:00 |
|
Brian.Dyke
|
9308ab8537
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 7390f6c3a8 [formerly db665d3876] [formerly 2a911984f0] [formerly 7390f6c3a8 [formerly db665d3876] [formerly 2a911984f0] [formerly 20dd249d2c [formerly 2a911984f0 [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]]]
Former-commit-id: 20dd249d2c
Former-commit-id: 8f0310e3be [formerly 46956a01c6] [formerly b67eecdaf5931ae1d938fb48bd33e3327dd7a473 [formerly 72ea2fbe48]]
Former-commit-id: 1353c554161d3298ae22ce357602c081830d7584 [formerly a3ccdd9704]
Former-commit-id: 572bbdd019
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
2b3ced91f5
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 06f6dfc38a [formerly 006bdb00ad] [formerly 65ad6056b6] [formerly 06f6dfc38a [formerly 006bdb00ad] [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 65ad6056b6 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]]
Former-commit-id: f3f95aabb0
Former-commit-id: 452a3f046b [formerly d174db3b0c] [formerly c24910662181554debcd898acc9cf5ec28027cf0 [formerly e77f1e126e]]
Former-commit-id: 2c9750edd9ade43fd7db7e61b4503a53d6f26781 [formerly 1d2dfd264a]
Former-commit-id: e100894074
|
2014-10-02 10:38:51 -04:00 |
|
Brian.Dyke
|
18c69d87e2
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: d1c62c3542 [formerly d4888adc0f] [formerly f47840e4d9] [formerly d1c62c3542 [formerly d4888adc0f] [formerly f47840e4d9] [formerly 2ac30f6c22 [formerly f47840e4d9 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]]]
Former-commit-id: 2ac30f6c22
Former-commit-id: 75ac4f1971 [formerly 277b6e4b36] [formerly 93329339083b58eea30cf9a2fd0c9efc1645f3bb [formerly 36d377e08d]]
Former-commit-id: 99779fb5c1561694dd3f154813fbc624081344ca [formerly 7e465baead]
Former-commit-id: c853463f73
|
2014-10-02 10:24:04 -04:00 |
|
Nate Jensen
|
efd471e4a9
|
Omaha #3675 remove explicitly declaring vm to make alertviz.sh more
closely match cave.sh
Change-Id: I930fea4d71c4cf6ec990e059469ed59af69b9662
Former-commit-id: 0aebb15a38 [formerly 9f74ca65bc] [formerly e964375fcc] [formerly 0aebb15a38 [formerly 9f74ca65bc] [formerly e964375fcc] [formerly 33e3281d55 [formerly e964375fcc [formerly 690868294ab74d5c3b73c12f81534d685bb652aa]]]]
Former-commit-id: 33e3281d55
Former-commit-id: 54d382fa7c [formerly 23ebf782f3] [formerly 021f3802d2585856e5af0f032cd3a2f6494ac93f [formerly 6670e31705]]
Former-commit-id: 8a5f64af32a17d5ab4c7881b654de0d811d9f419 [formerly b0e0632c7a]
Former-commit-id: e156cf3b33
|
2014-10-02 08:49:32 -05:00 |
|
Nate Jensen
|
8e57ca99b6
|
Omaha #3675 remove -clean option from installed caves
Change-Id: I2dc8f63d34e4247ebaa26f23c954d082d7bc4419
Former-commit-id: 8b4c2fd720 [formerly 694b39c979] [formerly fc60a83082] [formerly 8b4c2fd720 [formerly 694b39c979] [formerly fc60a83082] [formerly b5d8e0a423 [formerly fc60a83082 [formerly 9519a47ea459390148d07e97189df86e094c037b]]]]
Former-commit-id: b5d8e0a423
Former-commit-id: 2819f2b18f [formerly a77f2a5ff0] [formerly 0343ed95829458ea532eb0d9ea4f20aa2263d16e [formerly b6aa0ae3fc]]
Former-commit-id: 4517179069308046088b88a741a89e5c5502c0b4 [formerly a37e67946a]
Former-commit-id: 3f7391214f
|
2014-10-02 08:30:25 -05:00 |
|
Steve Harris
|
9af0816bb1
|
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: 0a8b36918a [formerly 09d8955b31] [formerly e201e1a493] [formerly 0a8b36918a [formerly 09d8955b31] [formerly e201e1a493] [formerly cc34483b0b [formerly e201e1a493 [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]]]]
Former-commit-id: cc34483b0b
Former-commit-id: 1935bca883 [formerly 8a627b9bf6] [formerly 624efa7bb6f054750278a0da16282ffd685e50b6 [formerly d711c1b67b]]
Former-commit-id: d7fad664b2074d5ba2b2d769ee3502435babad47 [formerly 074e12da64]
Former-commit-id: 18d68410e5
|
2014-10-02 08:09:02 -05:00 |
|
Nate Jensen
|
4a0c4d8f57
|
Merge "Omaha #2975 fix mkdirs() bug" into omaha_14.4.1
Former-commit-id: 1d0b39e615 [formerly 9e4bd6c1b7] [formerly cddda47923] [formerly 1d0b39e615 [formerly 9e4bd6c1b7] [formerly cddda47923] [formerly aa43004f85 [formerly cddda47923 [formerly c643d7c706ef39d1c17926b2a99bcfa2e52c3193]]]]
Former-commit-id: aa43004f85
Former-commit-id: d78f48f053 [formerly 00fb5931d1] [formerly 3d7280866175e6600c65078e6edc5ad140c14be4 [formerly 2bca618f67]]
Former-commit-id: 22473a0f17808adfa8489b383e0dcc75fa089788 [formerly e6aae5c0cd]
Former-commit-id: 9238cd370f
|
2014-10-02 07:57:30 -05:00 |
|
Nate Jensen
|
c6526b09d8
|
Merge "Omaha #3638 plugin xml for *export.point is now properly included" into omaha_14.4.1
Former-commit-id: 63d524c431 [formerly dd72c8e139] [formerly 116f6840e2] [formerly 63d524c431 [formerly dd72c8e139] [formerly 116f6840e2] [formerly 53f2bf8395 [formerly 116f6840e2 [formerly 155fdc66bca15c242345858152fcf0b129e28a6d]]]]
Former-commit-id: 53f2bf8395
Former-commit-id: 0b9ac4f0b6 [formerly 026a2eaa11] [formerly d2b391bcede8d48901bb6d5c5dd7a23e1187ca17 [formerly 96790c0377]]
Former-commit-id: 7124fa90c17af1ac99e83dfa7ed053710a9b9dc2 [formerly 40b23efda4]
Former-commit-id: de77597192
|
2014-10-01 15:06:03 -05:00 |
|
Brian.Dyke
|
64b52f6e95
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 64529eea01 [formerly 0be927be2d] [formerly 5ed17c0e24] [formerly 64529eea01 [formerly 0be927be2d] [formerly 5ed17c0e24] [formerly a4bfbea3c2 [formerly 5ed17c0e24 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]]]]
Former-commit-id: a4bfbea3c2
Former-commit-id: f180f63136 [formerly 4df4eb9c2b] [formerly a57615d594bf6386e1ca03920b1004483f28976a [formerly 914da168c8]]
Former-commit-id: af85c1c0498d395eb57281594d2bd53c3aeec77f [formerly 8184df119d]
Former-commit-id: ea401b327b
|
2014-10-01 15:36:06 -04:00 |
|
Andrew Benak
|
7f84fac2e6
|
Omaha #3638 plugin xml for *export.point is now properly included
Change-Id: Ib06ea93a28222eefa1522697e407d725d59be909
Former-commit-id: 68f934e63c [formerly 8ae0af5c6f] [formerly 659f4869bc] [formerly 68f934e63c [formerly 8ae0af5c6f] [formerly 659f4869bc] [formerly 7c7510d471 [formerly 659f4869bc [formerly 8c3cb6032fe79f68f24eb5dee7f3a820aa475257]]]]
Former-commit-id: 7c7510d471
Former-commit-id: 0b750823dd [formerly c711fa910f] [formerly 046414031b27e91c03c30ed846bc0f672ece6786 [formerly f2cfa613fc]]
Former-commit-id: 32bcc7aec3bfec34b9c10f79ae07799fea8b23b6 [formerly 3e4656a60a]
Former-commit-id: 04c5093eee
|
2014-10-01 14:30:28 -05:00 |
|
Nate Jensen
|
b712c8253c
|
Omaha #2975 fix mkdirs() bug
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f
Former-commit-id: 4dd895a3c5 [formerly 74883424ca] [formerly 319ea78480] [formerly 4dd895a3c5 [formerly 74883424ca] [formerly 319ea78480] [formerly 87d1286a0c [formerly 319ea78480 [formerly 3f63e3887f21b1cb5eb1ea1bb5225f492e161021]]]]
Former-commit-id: 87d1286a0c
Former-commit-id: 11fda5a021 [formerly 3e9cb23496] [formerly f2d72c6cb377ab601a5112dcea06cb19760c30ae [formerly b658187cdb]]
Former-commit-id: fa9bc4bb70b11c8a6ad1dd3e97cdcb2ef26df4fc [formerly 14da412d3d]
Former-commit-id: 91e97ad173
|
2014-10-01 14:22:22 -05:00 |
|
Nate Jensen
|
c180b9d833
|
Merge "Omaha #3678 don't enable jmx at alertviz or cave startup" into omaha_14.4.1
Former-commit-id: 16907b03de [formerly f7eac5f1db] [formerly a5e4190b35] [formerly 16907b03de [formerly f7eac5f1db] [formerly a5e4190b35] [formerly 3146dd083c [formerly a5e4190b35 [formerly 227ab9d68d59a9899025055a51b278bbcd9123f5]]]]
Former-commit-id: 3146dd083c
Former-commit-id: 18945e612e [formerly e65065461c] [formerly a226aa671f6062c53c35774f2fc096ac613d3381 [formerly 728328f400]]
Former-commit-id: 88853bbd1a9a3555b9971c6c02d797461b1e27d8 [formerly d148780c7c]
Former-commit-id: 647dc473bf
|
2014-10-01 11:55:38 -05:00 |
|
Nate Jensen
|
56dd0566f7
|
Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15
Former-commit-id: 1a4b7cc454 [formerly fce7d5899f] [formerly 482af416b3] [formerly 1a4b7cc454 [formerly fce7d5899f] [formerly 482af416b3] [formerly f2633a56c0 [formerly 482af416b3 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]]]]
Former-commit-id: f2633a56c0
Former-commit-id: f0362a03d4 [formerly f7a075907c] [formerly 2a2d868056e74cb4e29f291cba399ffd3f99c3fc [formerly 18acca9ef8]]
Former-commit-id: bc2c3efd4b7820055c54a4ed22e533c68dff148b [formerly b5998c975b]
Former-commit-id: d4b7693f81
|
2014-10-01 11:53:40 -05:00 |
|
Robert Blum
|
473b13d9d3
|
Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing.
Former-commit-id: 9e885cd270 [formerly 6a775aa2be] [formerly a1d23e4198] [formerly 9e885cd270 [formerly 6a775aa2be] [formerly a1d23e4198] [formerly d5994a8a6b [formerly a1d23e4198 [formerly 9d9065714e1fffa3b65e0f2ccb724dc1dd7a4e7b]]]]
Former-commit-id: d5994a8a6b
Former-commit-id: fb258e074b [formerly 4bb7ed8b2f] [formerly 2b50918a864a6561f6ca63465c557e0f0f669c60 [formerly 6c1676e743]]
Former-commit-id: afa8ac249a3defa7bcb35324e0be32ecf763713e [formerly 100e24245f]
Former-commit-id: 2d7c61f0a8
|
2014-10-01 10:22:25 -05:00 |
|
Nate Jensen
|
0e57a71184
|
Omaha #3678 don't enable jmx at alertviz or cave startup
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7
Former-commit-id: 8c3c592190 [formerly 131f5ec9f7] [formerly 799ba1babf] [formerly 8c3c592190 [formerly 131f5ec9f7] [formerly 799ba1babf] [formerly 41427a57bb [formerly 799ba1babf [formerly 501aa1ac560f34024ab906391dc8c22c422d8509]]]]
Former-commit-id: 41427a57bb
Former-commit-id: 0b0b9900fe [formerly e6100e8e7f] [formerly 8b3857e4c194aa2076e394aa0028ebf5c0ba2ab8 [formerly 78054658a3]]
Former-commit-id: eac63f07f79044de4bb76979473040b0e13d3b46 [formerly 86271d7dc9]
Former-commit-id: 18f7a6f1c0
|
2014-10-01 09:46:56 -05:00 |
|
dmsys
|
6b2eccce36
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]]
Former-commit-id: 9f4560c480
Former-commit-id: 0cb584f44e [formerly 07f84c6b26] [formerly 674f011faa89a8d6263043b42cfc79d80e3b82b4 [formerly b884e5e32d]]
Former-commit-id: 8f7a656cd223aa4bbbad7217939da98d6e8672ab [formerly e00ea2d8cd]
Former-commit-id: 71d6e48473
|
2014-09-30 13:45:54 -04:00 |
|
Nate Jensen
|
7c60d22c70
|
Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 1b08756d5c [formerly 6d382220a3] [formerly 057e5eda1a] [formerly 1b08756d5c [formerly 6d382220a3] [formerly 057e5eda1a] [formerly 510d26050d [formerly 057e5eda1a [formerly 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083]]]]
Former-commit-id: 510d26050d
Former-commit-id: 9a5d59439a [formerly aa526b5dfd] [formerly 42e79970c3fdd6d0b0e8fb734c22677388f48746 [formerly a79d34801b]]
Former-commit-id: 8155626ac26143b96fcd6110ab76d9d781526da8 [formerly eaaacc67c6]
Former-commit-id: 3f983b9fa4
|
2014-09-29 17:50:34 -05:00 |
|
Nate Jensen
|
fd52d638a2
|
Omaha #3663 move features that contain primarily ncep plugins to ncep
folder
Change-Id: I5d59e1c0618fa26c1f8b3e6f340f255119a72a40
Former-commit-id: 3201dc473b [formerly 867a0e09ae] [formerly 1b51c48468] [formerly 3201dc473b [formerly 867a0e09ae] [formerly 1b51c48468] [formerly 8c0a087bf0 [formerly 1b51c48468 [formerly f785d88ee1c388b564921c3ecd8c931329639f04]]]]
Former-commit-id: 8c0a087bf0
Former-commit-id: 972b559eb5 [formerly 12ede9423a] [formerly 940599fb59d7ae7918d915486530788e8a8bbaaa [formerly d4793b5521]]
Former-commit-id: 53c4dced67d8ecab6955b08a7428a8178d45636d [formerly 900768960a]
Former-commit-id: 9875b5a58f
|
2014-09-29 17:24:34 -05:00 |
|
Ron Anderson
|
93fc56a9ca
|
Merge "Omaha #2975 optimize lookup of edit areas and gfe configs" into omaha_14.4.1
Former-commit-id: ed2b4e9bfb [formerly 8116a665a8] [formerly a9827b0545] [formerly ed2b4e9bfb [formerly 8116a665a8] [formerly a9827b0545] [formerly 245804a21a [formerly a9827b0545 [formerly 918dcb1b91fb45b84a82df42b7fe2d3fc2f86fa0]]]]
Former-commit-id: 245804a21a
Former-commit-id: 0d452f7961 [formerly d1ef4c7284] [formerly f644ea06f6a3769ab76168bd14a4459675cbc7ce [formerly 4ebb5b59df]]
Former-commit-id: 91b7bc7d29714ee5cd86f5d44c97d204d80245f3 [formerly 923aca6f7f]
Former-commit-id: 0e924a980f
|
2014-09-29 16:10:37 -05:00 |
|
Steve Harris
|
10752cbc42
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: 6900bb61c1 [formerly 3598e9b5b6] [formerly 90e08b96e1] [formerly 6900bb61c1 [formerly 3598e9b5b6] [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: e9774e46ea [formerly 842abaad49] [formerly 1f609e71c1d55fbd64663d85caf8d8fbf61ab92c [formerly 6330a62e85]]
Former-commit-id: df06a15df0e12cfd77916f5f59e1b95c241b34d2 [formerly 30f0d27dfb]
Former-commit-id: 4c4380580f
|
2014-09-29 12:58:56 -05:00 |
|
Nate Jensen
|
60aa88c327
|
Omaha #2975 optimize lookup of edit areas and gfe configs
Change-Id: Ic89c84e79a27476ebb28573d49f60429424d4c37
Former-commit-id: df979f3301 [formerly c75ff5530d] [formerly 1b70e053a1] [formerly df979f3301 [formerly c75ff5530d] [formerly 1b70e053a1] [formerly c3648d1989 [formerly 1b70e053a1 [formerly 860bcc70144d9a8478aef3cc9ebfe84e98b6c4a7]]]]
Former-commit-id: c3648d1989
Former-commit-id: 7e5e675179 [formerly 32bd82e744] [formerly 50c5e64cb59fdce443930c37b4f42e10da23e3c7 [formerly 0b2e919eae]]
Former-commit-id: f97432e5b76f62421fc4c2e904190b6f630b8c6b [formerly 98ff4d7cc5]
Former-commit-id: db4d16b3a0
|
2014-09-29 12:29:25 -05:00 |
|
Ben Steffensmeier
|
51d14fe247
|
Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: ed401f7250 [formerly b333960362] [formerly c573db2918] [formerly ed401f7250 [formerly b333960362] [formerly c573db2918] [formerly 95b096192b [formerly c573db2918 [formerly e93157375f90c6cc2038db9a78346592e4d46b0e]]]]
Former-commit-id: 95b096192b
Former-commit-id: 33ac3fa012 [formerly 923ead3167] [formerly b5b30fb554ce5a1662f9e0a71423cb921b5a5de4 [formerly 3c55b8166c]]
Former-commit-id: 44ec49710bc32dea4a3a15c9fafa5ec79198f50b [formerly dc7966cdec]
Former-commit-id: 41b2311008
|
2014-09-29 11:20:33 -05:00 |
|
Steve Harris
|
51dc2a3cc0
|
Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: 73f0f5b364 [formerly fdfe16985d] [formerly 46da726675] [formerly 73f0f5b364 [formerly fdfe16985d] [formerly 46da726675] [formerly c03bc273da [formerly 46da726675 [formerly 49ad8e0e780443a0439227694a92ec8ab683b125]]]]
Former-commit-id: c03bc273da
Former-commit-id: 5258758f00 [formerly dd92661aba] [formerly e9d263d5e3d4ae86f04bc281e88f66ef7053628d [formerly 7c37aaa92e]]
Former-commit-id: 349ffbd052c9aafa425b36741904040d25416ad7 [formerly af7f1cf232]
Former-commit-id: d19a7675a9
|
2014-09-29 11:14:32 -05:00 |
|
Ben Steffensmeier
|
f91216c747
|
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: a0d9cbede4 [formerly 6090625040] [formerly f92d021e96] [formerly a0d9cbede4 [formerly 6090625040] [formerly f92d021e96] [formerly 5b10ac2f36 [formerly f92d021e96 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]]]
Former-commit-id: 5b10ac2f36
Former-commit-id: 7af0ea9a67 [formerly 0724aa4e71] [formerly c2fe7f41a12299fdb484361788b79338e9ad2fb8 [formerly 107ccbf332]]
Former-commit-id: dc765b86dda41ab7f5eb30a55c9560bd57a0313f [formerly fc49d0bd55]
Former-commit-id: a69ec7c7af
|
2014-09-29 10:49:14 -05:00 |
|
Brian.Dyke
|
ab1f21c096
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: fac7a6aaa1 [formerly fce029653d] [formerly 0a497fc015] [formerly fac7a6aaa1 [formerly fce029653d] [formerly 0a497fc015] [formerly 46af1d0857 [formerly 0a497fc015 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]]]
Former-commit-id: 46af1d0857
Former-commit-id: ad3338e07f [formerly 886c1b7e3d] [formerly 9fc151f40941f9cab99d6eb050662408c5746324 [formerly 85676ff532]]
Former-commit-id: 0acefdbae8bda17deeb120ade9ca40a2e782cfaa [formerly 4d5f7db303]
Former-commit-id: 23450210b1
|
2014-09-29 11:20:57 -04:00 |
|
Brian.Dyke
|
61e0794afa
|
Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 008769daef [formerly 8e459ec500] [formerly 550ffba7b0] [formerly 008769daef [formerly 8e459ec500] [formerly 550ffba7b0] [formerly 142432ba5e [formerly 550ffba7b0 [formerly 93ddf672c137c7221e9595e8b5c1b279084cb451]]]]
Former-commit-id: 142432ba5e
Former-commit-id: 2933a8feb6 [formerly 5da730103f] [formerly c6128f8c799ccef707e6c3fff938b928bef40d43 [formerly 63e3d61ff5]]
Former-commit-id: c291b04ca8130a58761f4f6824329e24c5bdae85 [formerly de0dc96df8]
Former-commit-id: ab28cb0583
|
2014-09-26 16:14:06 -04:00 |
|
David Friedman
|
ed3bed65d4
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: ea894ca5fc [formerly 86100b6ca8] [formerly 6791e8d885] [formerly ea894ca5fc [formerly 86100b6ca8] [formerly 6791e8d885] [formerly 05707d0f20 [formerly 6791e8d885 [formerly 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb]]]]
Former-commit-id: 05707d0f20
Former-commit-id: 39608cef87 [formerly 78f7f0fc88] [formerly e4217632693bc1a8536646a8fa63f65c055822c6 [formerly b3bd3a9d7f]]
Former-commit-id: c1bf57bee47fd5a37681a17e8a8301df05b879d9 [formerly 1204c0d666]
Former-commit-id: cd643396d6
|
2014-09-26 20:05:46 +00:00 |
|
Brian.Dyke
|
d81096c5ca
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 698273b551 [formerly 396f9755dc] [formerly 1ac61fb612] [formerly 698273b551 [formerly 396f9755dc] [formerly 1ac61fb612] [formerly f26fe97ec4 [formerly 1ac61fb612 [formerly 5b570e5229628de88068edee1c70c26eec13f71a]]]]
Former-commit-id: f26fe97ec4
Former-commit-id: 19bd990683 [formerly f6af0dd0df] [formerly 2c9cf5cc04ae60ed33371ee6fa605e762929a4a0 [formerly 33525968e3]]
Former-commit-id: 2fb1e2bc67ea5f2cb68c1b79a31dc29d8cfb3cb8 [formerly 4359e8dc47]
Former-commit-id: b481c3f064
|
2014-09-26 14:19:03 -04:00 |
|
Brian.Dyke
|
d07c8dfefb
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 67a9c88d27 [formerly f520ff97b6] [formerly 8245370186] [formerly 67a9c88d27 [formerly f520ff97b6] [formerly 8245370186] [formerly a4f68caac6 [formerly 8245370186 [formerly 6ed90023551e25216c10d05f2568593992326900]]]]
Former-commit-id: a4f68caac6
Former-commit-id: 062dbe5bb9 [formerly 328edcaebf] [formerly 781fbb9e9a10fef8b099386a964b7a41bc80831b [formerly 34a073a848]]
Former-commit-id: 6a13079a74ca3b525400419cdecb2b0ed33c775b [formerly 554cb1a84d]
Former-commit-id: ccbb922254
|
2014-09-26 13:02:49 -04:00 |
|
Brian.Dyke
|
b22b8a7e7e
|
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 3b71fe393a [formerly 0045c3100f] [formerly 586a504500] [formerly 3b71fe393a [formerly 0045c3100f] [formerly 586a504500] [formerly bd983e1932 [formerly 586a504500 [formerly d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7]]]]
Former-commit-id: bd983e1932
Former-commit-id: 8c9dab9e0d [formerly 30f8b55a19] [formerly 9542d4e85f18f0b367f543c554364189920d2e5c [formerly 95d80abd56]]
Former-commit-id: 9be16538ca3909938b2e8889eb9c1163b5ec910a [formerly 295e2814f7]
Former-commit-id: 7f65a5b799
|
2014-09-26 11:47:38 -04:00 |
|
David Friedman
|
9bda6e748f
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae
Former-commit-id: 52788dc473 [formerly 1737d16a5c] [formerly 33aee54b8f] [formerly 52788dc473 [formerly 1737d16a5c] [formerly 33aee54b8f] [formerly db29ec9dec [formerly 33aee54b8f [formerly c8aa2fbfc35c872e2d50de2212eaf16db9b5483d]]]]
Former-commit-id: db29ec9dec
Former-commit-id: 3a4b64b244 [formerly f207169057] [formerly 98df6f24bb854efcf38b4d519a69b4cfb6549f6a [formerly bda6e42529]]
Former-commit-id: c67aaf513adc787fca00ecbf1b8b3865e61359b3 [formerly a740acaedf]
Former-commit-id: 140950a966
|
2014-09-26 15:13:56 +00:00 |
|
David Friedman
|
2ccc61d974
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03
Former-commit-id: e186ecc15f [formerly cfcfc17a2b] [formerly 41820f112f] [formerly e186ecc15f [formerly cfcfc17a2b] [formerly 41820f112f] [formerly c85b0d1cfd [formerly 41820f112f [formerly 70b520c08670646047ffa753814f98c032938ff8]]]]
Former-commit-id: c85b0d1cfd
Former-commit-id: aa44cc223f [formerly 7f9fdcb74b] [formerly 85fb0295278cf649fceb869b36e00a9b5838cced [formerly f6d3a80dbf]]
Former-commit-id: 89bc5587a18c450923f919a65eb6b7c148de99d5 [formerly d1160ea2ca]
Former-commit-id: a45e6dfdcf
|
2014-09-26 13:07:28 +00:00 |
|
David Friedman
|
5731b7be45
|
ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028
Former-commit-id: 15956c0d58 [formerly c16f5c2e7c] [formerly 5755c120d5] [formerly 15956c0d58 [formerly c16f5c2e7c] [formerly 5755c120d5] [formerly e82f96193e [formerly 5755c120d5 [formerly 117c2f072b647e353456832f2f0088d51a660d65]]]]
Former-commit-id: e82f96193e
Former-commit-id: 38b1f21829 [formerly 214002e207] [formerly 3dbc33db262d9bada00bd433cc886c15d5c7e52e [formerly 07befd1cce]]
Former-commit-id: dea055fed7e293d338ce1c20c31a4130f4243601 [formerly 4aa2667d1f]
Former-commit-id: 73b0da212a
|
2014-09-25 22:10:42 +00:00 |
|
David Friedman
|
30ee562dc7
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: d8618f1419 [formerly 973d0b9a55] [formerly b3025aacb0] [formerly d8618f1419 [formerly 973d0b9a55] [formerly b3025aacb0] [formerly 8ab4649312 [formerly b3025aacb0 [formerly 5048af915b004067ec8a6e788a0e9ad3e006c9d8]]]]
Former-commit-id: 8ab4649312
Former-commit-id: d017509506 [formerly a10060f45d] [formerly 78ef0251563c92144b5b39f6944eb8273d2bbaee [formerly c19d9ee755]]
Former-commit-id: 6265764de67efa983a3247d8e0f688518aca6844 [formerly f6a6032d61]
Former-commit-id: 0a94f1ccfb
|
2014-09-25 21:07:16 +00:00 |
|
Qinglu.Lin
|
a54643cb55
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5
Former-commit-id: 66aa148879 [formerly 1c55b5c400] [formerly 94fed71091] [formerly 66aa148879 [formerly 1c55b5c400] [formerly 94fed71091] [formerly ef851d0016 [formerly 94fed71091 [formerly 8b194664458246dad7509c44bcc07480cb088ddd]]]]
Former-commit-id: ef851d0016
Former-commit-id: d17c5c4cea [formerly 94e636a862] [formerly d474e64298e43533fc8fae332206a5876ea17ca1 [formerly 3e1d8d83a9]]
Former-commit-id: 66190dcbfae8433d1114faa1702550156ed8f5da [formerly c3be043b3a]
Former-commit-id: 73c0213b36
|
2014-09-25 15:16:42 -04:00 |
|
Ana Rivera
|
c64deae465
|
VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8
Former-commit-id: 11fbbb65be [formerly e55855b4ff] [formerly d96f5fe229] [formerly 11fbbb65be [formerly e55855b4ff] [formerly d96f5fe229] [formerly a72725f9ef [formerly d96f5fe229 [formerly 833cff4f37542078578de96b3b59723f77c31f4c]]]]
Former-commit-id: a72725f9ef
Former-commit-id: 3ce2d592ea [formerly 1b94e7fdb2] [formerly 8f0e345142e3f88b585dcd2c3828b7bdbd6bd4d2 [formerly dd45d98a0e]]
Former-commit-id: cded20de1b1d1953e821ffc9e88052564abb75d7 [formerly 97ae16163f]
Former-commit-id: ab3de760b0
|
2014-09-25 17:46:53 +00:00 |
|
Nate Jensen
|
2f9d5c2d0e
|
Omaha #3571 better error handling of invalid geom with map caching
Change-Id: I3947613aab5a7789b32ea1d0e3a8e3091d9690d8
Former-commit-id: 64564a850a [formerly 1ec55dfc22] [formerly c0b7fc0ac7] [formerly 64564a850a [formerly 1ec55dfc22] [formerly c0b7fc0ac7] [formerly 987060f56c [formerly c0b7fc0ac7 [formerly 0f2066e985dcbcedd2794ce226232efe999b1312]]]]
Former-commit-id: 987060f56c
Former-commit-id: a2569362ef [formerly 06c02a04b6] [formerly ccc08ea1a575dfb5ac3e6b58abf999806caa0f10 [formerly aa370e474e]]
Former-commit-id: 0600fe2fa54a913ecb832305e73549d8b1d10d4d [formerly 3028f3ab1f]
Former-commit-id: e83580e13a
|
2014-09-25 11:30:27 -05:00 |
|
Nate Jensen
|
7eda42086f
|
Merge "Omaha #3220 - Changes in the area configuration files for FSSObs monitors." into omaha_14.4.1
Former-commit-id: b7ebdc03a8 [formerly e74bfdc195] [formerly 364aff9278] [formerly b7ebdc03a8 [formerly e74bfdc195] [formerly 364aff9278] [formerly 174b036c56 [formerly 364aff9278 [formerly e2f23221c3f8301460df2945deb8c760cdf216e9]]]]
Former-commit-id: 174b036c56
Former-commit-id: 0da3b2aaa0 [formerly d1171b2e18] [formerly d1b9fbdb2c0bf0c8e5787313433654c4e2fd74c0 [formerly ad6bd4e7ff]]
Former-commit-id: a49ee09ae4e91c4e9ac250a93aece737d00614cc [formerly eb077c4bcf]
Former-commit-id: 3c7d92703e
|
2014-09-25 08:44:50 -05:00 |
|
Slav Korolev
|
8ed04b61f1
|
Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
Former-commit-id: 87c7787cb2 [formerly 1120f9a440] [formerly 7b1a4c6774] [formerly 87c7787cb2 [formerly 1120f9a440] [formerly 7b1a4c6774] [formerly ce2ef5019b [formerly 7b1a4c6774 [formerly d7a921d6206f5b09e7a6784c7e86b9167b74685f]]]]
Former-commit-id: ce2ef5019b
Former-commit-id: 2272e5581a [formerly 7e739e4197] [formerly ff4736b57ad7b9270a66a08b26833bcbbe520650 [formerly 11ee774939]]
Former-commit-id: aca0ddcbd2e670daff2cd8182a38f2ae07972d37 [formerly 3033eba2f3]
Former-commit-id: 27f8c438d2
|
2014-09-25 09:02:27 -04:00 |
|