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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
Nate Jensen
|
742f8cc5f9
|
Omaha #3663 move airep and pirep plguins to ncep features
Change-Id: I2c9a274ee85b24e93800fa7c0f73739030995219
Former-commit-id: d01c6840cb [formerly 86b76b399d ] [formerly 4cf93c0acb ] [formerly d01c6840cb [formerly 86b76b399d ] [formerly 4cf93c0acb ] [formerly 36556fc48b [formerly 4cf93c0acb [formerly 8f743862722b2af08e6659ca3beb0366095bcf79]]]]
Former-commit-id: 36556fc48b
Former-commit-id: 7151163590 [formerly f2432e5a47 ] [formerly 42040ec1f8eb4def731414fbfcf5eb5dc4800ef2 [formerly 98d47a8dd2 ]]
Former-commit-id: eaf174e4928bc6c4a7fb407135d842759bdadf59 [formerly 6bfa9cd589 ]
Former-commit-id: 8096bd8fdc
|
2014-09-24 15:20:17 -05:00 |
|
Brian.Dyke
|
b8b9d3105b
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
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
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: 6dafb062e9 [formerly b49b13f77e ] [formerly 4b418918d4 ] [formerly 6dafb062e9 [formerly b49b13f77e ] [formerly 4b418918d4 ] [formerly 87fa32d2d4 [formerly 4b418918d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]]]
Former-commit-id: 87fa32d2d4
Former-commit-id: e16e6e5a2a [formerly cf8f88a5b3 ] [formerly cd9613c4078591bf28ad1064690bfbbbf551cbaa [formerly 1f09dad9e9 ]]
Former-commit-id: c0bfed574e2fa14299c865bac77af847704ef3c7 [formerly 8997f79ae4 ]
Former-commit-id: c22973f909
|
2014-09-24 11:05:37 -04:00 |
|
Nate Jensen
|
480dd1820b
|
Omaha #3009 make ffmp play nice with collaboration
Change-Id: Iccccec6dbe999d7677520a5b0f0464a2186f8174
Former-commit-id: 5eeb12f962 [formerly 9a70b28032 ] [formerly 8ac422d642 ] [formerly 5eeb12f962 [formerly 9a70b28032 ] [formerly 8ac422d642 ] [formerly e34c1a6fe8 [formerly 8ac422d642 [formerly ac15b82ed3c493a5ea8cca01ba304e95c965365e]]]]
Former-commit-id: e34c1a6fe8
Former-commit-id: bf7169eed8 [formerly a0180bad18 ] [formerly ba1f205f10e197990c40edc675781b28691f1a8a [formerly 93432f2a4d ]]
Former-commit-id: 9e43002240a8a2aef42c2f5a20335b33f62a4fc7 [formerly 85d4a24b2b ]
Former-commit-id: d1aaffd9c2
|
2014-09-23 15:37:09 -05:00 |
|
Steve Harris
|
07c7b38a12
|
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: db4aa1cebe [formerly 2e2072a963 ] [formerly 7692e3f21d ] [formerly db4aa1cebe [formerly 2e2072a963 ] [formerly 7692e3f21d ] [formerly b979960b7b [formerly 7692e3f21d [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]]]
Former-commit-id: b979960b7b
Former-commit-id: 4c7af33eee [formerly e5f8a8f74f ] [formerly bb2bf4306deda494aadd9b7efdffeebf393b4e15 [formerly 50d6dccd09 ]]
Former-commit-id: 0542ccaca6c476485c13ff1fd290c8c34213e7a0 [formerly f831536854 ]
Former-commit-id: d3169a96b0
|
2014-09-23 11:41:10 -05:00 |
|
Lee Venable
|
8a84c93b3a
|
Merge "Omaha #3356 remove unnecessary import" into omaha_14.4.1
Former-commit-id: e5a2182efe [formerly cfb35a88f9 ] [formerly b82ea41f9d ] [formerly e5a2182efe [formerly cfb35a88f9 ] [formerly b82ea41f9d ] [formerly 114010674f [formerly b82ea41f9d [formerly a158d4dbdf27311a04684bbda1afb3991fb0e09a]]]]
Former-commit-id: 114010674f
Former-commit-id: 8cefc136ca [formerly b4f2aed1b0 ] [formerly 37c6b5d3d61cab8155827732b3e50c06cb558c24 [formerly f88f41446a ]]
Former-commit-id: f0e04c19b41b7c925563b4a261294c7abadb9221 [formerly 192b865509 ]
Former-commit-id: ec2e68f901
|
2014-09-23 10:56:20 -05:00 |
|
Nate Jensen
|
7e8c34fa81
|
Omaha #3356 remove unnecessary import
Change-Id: Id1ad295d1adb29de072173a4137a5e5f612b48ac
Former-commit-id: e5d0125405 [formerly 92c1027ff7 ] [formerly 41fcd2b7b6 ] [formerly e5d0125405 [formerly 92c1027ff7 ] [formerly 41fcd2b7b6 ] [formerly 568559f2ce [formerly 41fcd2b7b6 [formerly ad3753d57709fe8efeab2fb400d92b6ec61c2a3e]]]]
Former-commit-id: 568559f2ce
Former-commit-id: 1453723c0c [formerly b30c3d1b7c ] [formerly 56ecb600903402bf87ded62bda754444caea8ced [formerly 9f04152945 ]]
Former-commit-id: 723ec5aa516e9c66c493a9cb979cf0240b15acd9 [formerly 4e8a58e91e ]
Former-commit-id: 4b16070472
|
2014-09-23 08:21:18 -05:00 |
|
Nate Jensen
|
d50284361f
|
Omaha #3356 fix apps_dir setting detection in viz/cave
Change-Id: If78a4ec84f6237450a6494c06b5a5271c66f10a3
Former-commit-id: 2477ef370c [formerly 9ef3bce809 ] [formerly e163ae0e5b ] [formerly 2477ef370c [formerly 9ef3bce809 ] [formerly e163ae0e5b ] [formerly e637963736 [formerly e163ae0e5b [formerly ca8195c7835b9d96158d048fdd548cc744ba96bc]]]]
Former-commit-id: e637963736
Former-commit-id: 5b6aa1cead [formerly 0ef93eb57a ] [formerly b31c62f306b5e664170ebbb70ece7395a9f2b165 [formerly 9c316ec38c ]]
Former-commit-id: cb9c5bafc7482da6f0cd34cd8fc3c1221db52651 [formerly 6ff3a4435d ]
Former-commit-id: ff738247f3
|
2014-09-22 13:00:04 -05:00 |
|
Brian.Dyke
|
c193a1f5fa
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 32d63dff6f [formerly 75f3bb31d5 ] [formerly 4db67c581c ] [formerly 32d63dff6f [formerly 75f3bb31d5 ] [formerly 4db67c581c ] [formerly 8d665b93b5 [formerly 4db67c581c [formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]]]]
Former-commit-id: 8d665b93b5
Former-commit-id: bcc56046bf [formerly 12bf31b5ba ] [formerly ff6534596aacc592c8b0f4b60c891f034080aa68 [formerly b83e12da28 ]]
Former-commit-id: bd62d5877a93702470bee3f0e2833f1a5154373a [formerly c4d7c97897 ]
Former-commit-id: 763439c814
|
2014-09-19 16:56:50 -04:00 |
|
Ben Steffensmeier
|
4da44448cf
|
Omaha #3300 Fix component and mosaic merge problems
Former-commit-id: 6d8b9df40b [formerly 766fdd80a8 ] [formerly 72f5799c44 ] [formerly 6d8b9df40b [formerly 766fdd80a8 ] [formerly 72f5799c44 ] [formerly 217caaba15 [formerly 72f5799c44 [formerly 201854ac4154dc8526bf99bde69674ad51ec50ad]]]]
Former-commit-id: 217caaba15
Former-commit-id: b62ee08912 [formerly 66eae6f360 ] [formerly ec74e812030fb60e345e49ac2a36b44449679873 [formerly c02072c2e2 ]]
Former-commit-id: 08bdb8041735914d320d51b3c5c4fa03ae2647bd [formerly f4fef04e89 ]
Former-commit-id: 4e6c331288
|
2014-09-19 15:08:21 -05:00 |
|
Brian.Dyke
|
d59e657f7d
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 3791bd2cae [formerly 9fc3eb20c1 ] [formerly 6ad8d500ef ] [formerly 3791bd2cae [formerly 9fc3eb20c1 ] [formerly 6ad8d500ef ] [formerly 9c33ae6d2c [formerly 6ad8d500ef [formerly e895f7927a95c2416c05953e131d9e0c6095beb3]]]]
Former-commit-id: 9c33ae6d2c
Former-commit-id: b7e59206c0 [formerly a97370769f ] [formerly 5a05794d1c03691d1fb43dc90829680f320709fc [formerly 3b48d6368d ]]
Former-commit-id: 2ea91b5d02b51b05412fa8227d82fc67b6fdb6af [formerly 2a456a1b9b ]
Former-commit-id: d1c45356d3
|
2014-09-19 14:42:29 -04:00 |
|
Brian.Dyke
|
c057bba4ca
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 0ae72bd3d3 [formerly 813d2be68e ] [formerly 88d5f872ae ] [formerly 0ae72bd3d3 [formerly 813d2be68e ] [formerly 88d5f872ae ] [formerly 9435507b27 [formerly 88d5f872ae [formerly aaae61509d743553186cdefdea0557158b139527]]]]
Former-commit-id: 9435507b27
Former-commit-id: 980783df22 [formerly c94cc5fe38 ] [formerly 4e839ccfa8ae121ec2d5ed3024bb210a57c147c4 [formerly 1b8af8379f ]]
Former-commit-id: d7644d57fd9c207a751459519eb4150674be72d5 [formerly ebbb7003d9 ]
Former-commit-id: caa450388a
|
2014-09-19 13:14:13 -04:00 |
|
Brian.Dyke
|
3211a1385d
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 1704e76ac1 [formerly 279f67ff54 ] [formerly 7f49052445 ] [formerly 1704e76ac1 [formerly 279f67ff54 ] [formerly 7f49052445 ] [formerly e601d3fa51 [formerly 7f49052445 [formerly 88e26cd8b378ffc81db87aee226ceca47ae58aa7]]]]
Former-commit-id: e601d3fa51
Former-commit-id: c5c0411e7d [formerly a4f3bc977a ] [formerly dbd4da701ca473277a6ec9ae5c0c89deed3229e3 [formerly 418ba90277 ]]
Former-commit-id: e55adb53ed2a276192e95f1c76b7c88ac50c7298 [formerly 2d6b354631 ]
Former-commit-id: 11e45913f1
|
2014-09-19 13:08:06 -04:00 |
|
Mark Peters
|
9a79a99c9c
|
Omaha #3300 Merge fixes for 14.4.1
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd
Former-commit-id: e50c04fa7e [formerly e99d90307b ] [formerly 048e8339fd ] [formerly e50c04fa7e [formerly e99d90307b ] [formerly 048e8339fd ] [formerly 26e4f86248 [formerly 048e8339fd [formerly 1ecf38ee8614f3df751fe9debbdfdb2771e5bea1]]]]
Former-commit-id: 26e4f86248
Former-commit-id: 3ee2040ac5 [formerly 16961860a8 ] [formerly 2e7d5383f31c3fc91ba8aeac92800d4fa2640c06 [formerly c49df63363 ]]
Former-commit-id: 4387f6222b3b4a139a9e0ad105a79daf051019d9 [formerly 08a3acb2d4 ]
Former-commit-id: 494a7bc745
|
2014-09-19 12:01:07 -05:00 |
|
Steve Harris
|
b316e73f24
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: e3a7796362 [formerly da530db540 ] [formerly 091555cf10 ] [formerly e3a7796362 [formerly da530db540 ] [formerly 091555cf10 ] [formerly 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]]
Former-commit-id: 4c56844e29
Former-commit-id: a1bf8ecdb1 [formerly 84a98ec4ca ] [formerly 275a024694cc566f868a949d844ab91490e424f6 [formerly 214b48dcb8 ]]
Former-commit-id: 9adb015794435a13e656ce09cd891bfd9e4d53db [formerly fdc523a026 ]
Former-commit-id: f4ea796cea
|
2014-09-19 10:28:57 -05:00 |
|
Ana Rivera
|
a093261309
|
VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06
Former-commit-id: 812cccb32f [formerly 2a25376398 ] [formerly 9d8c08a09a ] [formerly 812cccb32f [formerly 2a25376398 ] [formerly 9d8c08a09a ] [formerly 56f409717f [formerly 9d8c08a09a [formerly 3af534fb2778268fee650c09c5aa0346df746ce8]]]]
Former-commit-id: 56f409717f
Former-commit-id: 0d22a83eb7 [formerly 9bc42712de ] [formerly 5fa715a0b380b4d955c4a393daac5a80999d92fa [formerly 030d8c45b7 ]]
Former-commit-id: 1d247bdcbcce5a659732a169d2f30f0fb41c8ad7 [formerly c12eb3b106 ]
Former-commit-id: 2302527f91
|
2014-09-19 15:17:46 +00:00 |
|
Nate Jensen
|
0dcbeb2961
|
Merge "Omaha #2735 unpack plugins that contribute spring xml to viz" into omaha_14.4.1
Former-commit-id: f3b0e000e4 [formerly 2c31cb32d3 ] [formerly b1ba40e577 ] [formerly f3b0e000e4 [formerly 2c31cb32d3 ] [formerly b1ba40e577 ] [formerly 83cc50ad69 [formerly b1ba40e577 [formerly 55219fea5034bdc8e9aab3fb2142933e5d65b739]]]]
Former-commit-id: 83cc50ad69
Former-commit-id: b81e143bc8 [formerly a5beee8a4f ] [formerly 0c560c51c13d8d82e66d34a0f9851a6ad4f12e52 [formerly 8a4fb073d3 ]]
Former-commit-id: 03783846198150360b087d8c57d01bf387f7a499 [formerly 3dfb463f88 ]
Former-commit-id: 28e5123de5
|
2014-09-18 14:52:17 -05:00 |
|
Nate Jensen
|
eb03d61765
|
Merge "Omaha #3531 fixed localization perspective refresh issue" into omaha_14.4.1
Former-commit-id: da14d7daef [formerly ccafb51aef ] [formerly 71823085b4 ] [formerly da14d7daef [formerly ccafb51aef ] [formerly 71823085b4 ] [formerly 81b78b957b [formerly 71823085b4 [formerly 676cffd04cae5ead141e20130c0c682a563d3e85]]]]
Former-commit-id: 81b78b957b
Former-commit-id: 7871955849 [formerly ff2ee0bd72 ] [formerly d901c387e404c3eba2cd3df94b80ab0f02711f5a [formerly 38e2cd0362 ]]
Former-commit-id: 43f881153eddcaff08509372b7212ef7484eed4e [formerly 49be820832 ]
Former-commit-id: b0688a4cb0
|
2014-09-18 14:22:22 -05:00 |
|
Nate Jensen
|
1cf125c57f
|
Omaha #2735 unpack plugins that contribute spring xml to viz
Change-Id: Iaa9340cb255650d3980daef10f30667b1224ac07
Former-commit-id: 9962a2e7fa [formerly d5d6a85ea8 ] [formerly 8ec8b13aac ] [formerly 9962a2e7fa [formerly d5d6a85ea8 ] [formerly 8ec8b13aac ] [formerly 820f1ae0b8 [formerly 8ec8b13aac [formerly f88da1dfebb37e60e7a32ce283495e45366f4975]]]]
Former-commit-id: 820f1ae0b8
Former-commit-id: b9066046ff [formerly 297a64e586 ] [formerly 1c90bfb5acf6c46f5b74cafd337e1b6ba4820132 [formerly 42b2ec5955 ]]
Former-commit-id: 5fc0b4dd7a3fd67f4016092f2094b5fcb749a00b [formerly 299a95988d ]
Former-commit-id: 66d0304173
|
2014-09-18 12:27:33 -05:00 |
|
Nate Jensen
|
e3efcd9118
|
Merge "Omaha #3356 fix service loader lookup for event bus" into omaha_14.4.1
Former-commit-id: 7ef19952eb [formerly 3276af7678 ] [formerly 2cc83b3d33 ] [formerly 7ef19952eb [formerly 3276af7678 ] [formerly 2cc83b3d33 ] [formerly cd7c46dbd6 [formerly 2cc83b3d33 [formerly 60b40cc4edbbcd7094e31ff3f5e496b8b5baf878]]]]
Former-commit-id: cd7c46dbd6
Former-commit-id: 8871a0c045 [formerly 5bbe8cdf69 ] [formerly edb56180c1a45af8a7cf685721450e75ea7e9134 [formerly 68d116ee7e ]]
Former-commit-id: 39d321acedf931dd5d2574683f82d35cec2b936d [formerly e538787826 ]
Former-commit-id: 5233d7eac2
|
2014-09-18 11:53:11 -05:00 |
|
Brian.Dyke
|
9a174527da
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 736ac16cb3 [formerly e70a9db68c ] [formerly c6b0adfc53 ] [formerly 736ac16cb3 [formerly e70a9db68c ] [formerly c6b0adfc53 ] [formerly 8b0603cdb8 [formerly c6b0adfc53 [formerly de22db308f36c42d5c7e0989dbd7decfaaf3adbb]]]]
Former-commit-id: 8b0603cdb8
Former-commit-id: 4e12c6c6b3 [formerly 87dfb0e978 ] [formerly 18d1159fb8fd3aab1d35c6728893c94b301b8bea [formerly d5f57cd98e ]]
Former-commit-id: 9947eb33ac6ce8ec463ab7144932a7ee55771f17 [formerly 37ffb37db6 ]
Former-commit-id: 64435ea860
|
2014-09-18 12:43:01 -04:00 |
|
Chip Gobs
|
2480df5ca0
|
VLab Issue #4611
Adding missing changed file.
Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e
Former-commit-id: bf7643c622 [formerly 0e4b8d2e9b ] [formerly 0d046a56e8 ] [formerly bf7643c622 [formerly 0e4b8d2e9b ] [formerly 0d046a56e8 ] [formerly 31efce6b8f [formerly 0d046a56e8 [formerly e68f56628f035ca2a20848a0e76f6efa8bbe1e8a]]]]
Former-commit-id: 31efce6b8f
Former-commit-id: e8d6084ce5 [formerly aa838b2230 ] [formerly 99ce169cc43297fde98f40a84ba2719cf478bcb2 [formerly a287a95ef9 ]]
Former-commit-id: b3eda53f2ebd79e93fb9db400582951260438006 [formerly 552430bda0 ]
Former-commit-id: 35439f3173
|
2014-09-18 12:12:42 -04:00 |
|
Brian Clements
|
9326925e83
|
Omaha #3531 fixed localization perspective refresh issue
paths were compared by string prefixes instead of path prefixes
Change-Id: I6dd55001f505dda65df21e54727f262e247a30ba
Former-commit-id: 78a3277f25 [formerly 7268d3dc76 ] [formerly 3d790a851b ] [formerly 78a3277f25 [formerly 7268d3dc76 ] [formerly 3d790a851b ] [formerly 673ccf5851 [formerly 3d790a851b [formerly 3cda9077130f30c21dbee5e8d16b59937a896cdd]]]]
Former-commit-id: 673ccf5851
Former-commit-id: 1d384a6206 [formerly 1720b40335 ] [formerly d9927cfde495e1fcfd530f8db52e3e279854607f [formerly bbd2eddcf5 ]]
Former-commit-id: 473fc0f5323a6aea20690d74de5bba0c8105f36f [formerly 986b66c850 ]
Former-commit-id: cc965c830f
|
2014-09-18 10:56:32 -05:00 |
|
Matthew Howard
|
b935520e00
|
Merge "ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use" into asm_14.3.1
Former-commit-id: 772655411e [formerly f3764d3bd3 ] [formerly 27c31ea90f ] [formerly 772655411e [formerly f3764d3bd3 ] [formerly 27c31ea90f ] [formerly 0d0aae9234 [formerly 27c31ea90f [formerly 0b0c2e1ea8188cd88c92fde4d4b999670aad17dc]]]]
Former-commit-id: 0d0aae9234
Former-commit-id: f5abc9b248 [formerly 0f086d9e3d ] [formerly d0b90aa54ddba7aad1949ff36d9c6da4636c9f1f [formerly b49cd025b9 ]]
Former-commit-id: ca917b75112b308138bf22d8b440bddfa75dc1b3 [formerly 16b1766cc0 ]
Former-commit-id: 42ba5d61df
|
2014-09-18 10:36:17 -05:00 |
|
Qinglu.Lin
|
efdd4beb40
|
ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use
Change-Id: I8bc59786379680f635e85917eebf4c9d6b4ea683
Former-commit-id: ac3b48719e [formerly 1aac17e599 ] [formerly 10da99d3f7 ] [formerly ac3b48719e [formerly 1aac17e599 ] [formerly 10da99d3f7 ] [formerly c2047b94b1 [formerly 10da99d3f7 [formerly f79ed1b1867b5516a390a8f70b2141052be3eb38]]]]
Former-commit-id: c2047b94b1
Former-commit-id: 25b7db654e [formerly 9c70d41d38 ] [formerly 61650c2f46b5493aaec391f67b4222df9caec990 [formerly ab0eb6a507 ]]
Former-commit-id: 4de38279e5fedd8b80b8985a1c7a0ef0310ee788 [formerly 448d4ceb2d ]
Former-commit-id: 1e3f3e2b84
|
2014-09-18 11:21:18 -04:00 |
|
Nate Jensen
|
5f9fd56b5e
|
Omaha #3356 fix service loader lookup for event bus
Change-Id: I9d53f7aaf1046c43cd90dfe7bbc957cbf9d1df12
Former-commit-id: ff0ccc9355 [formerly 406aff37e9 ] [formerly 9860c2e5ec ] [formerly ff0ccc9355 [formerly 406aff37e9 ] [formerly 9860c2e5ec ] [formerly 27fee9b714 [formerly 9860c2e5ec [formerly f6aa0b18cdc26d8cad5f3e35d134a784fb11f4d5]]]]
Former-commit-id: 27fee9b714
Former-commit-id: de6b095181 [formerly e41212dd39 ] [formerly 46e968e88b2d483941b29d3799decb603c544589 [formerly 656a038922 ]]
Former-commit-id: 8700c381d1abce5e1bfdedb2e173618efe05724b [formerly b4776d072f ]
Former-commit-id: f313e845c1
|
2014-09-17 16:56:39 -05:00 |
|
Nate Jensen
|
df7f8b0948
|
Merge "Omaha #3632 fixed index out of bounds for TCSResource" into omaha_14.4.1
Former-commit-id: 735f1f44b9 [formerly 22a5011456 ] [formerly 2ed2275797 ] [formerly 735f1f44b9 [formerly 22a5011456 ] [formerly 2ed2275797 ] [formerly c9e08540d1 [formerly 2ed2275797 [formerly 5bf4208ce50052e64d76c4227f237d85b72cb285]]]]
Former-commit-id: c9e08540d1
Former-commit-id: 2c570cb7a0 [formerly 1b0c069cc5 ] [formerly bbc0cb7c44526b91a1689b7b4bcc8e1d00d39ba2 [formerly f0b3bb04fa ]]
Former-commit-id: 31d89bacf2673069d7dec43376fae7b79cd09732 [formerly 584ad613a7 ]
Former-commit-id: 56d557ae89
|
2014-09-17 16:26:52 -05:00 |
|
Matthew Howard
|
78167e2729
|
Merge "ASM #537 - fix for AvnFPS: Syntax failed to flag format error" into asm_14.3.1
Former-commit-id: cb3f6ca3ba [formerly cfda29cc8a ] [formerly 7b369e5ccc ] [formerly cb3f6ca3ba [formerly cfda29cc8a ] [formerly 7b369e5ccc ] [formerly bb0e06d09d [formerly 7b369e5ccc [formerly 45a5185657de4c3e3c330a5a8604078fe1ccde2a]]]]
Former-commit-id: bb0e06d09d
Former-commit-id: e3572cade5 [formerly 872e6f934a ] [formerly 605e753be0b2accd6531b5ca596e0bc6d4fb1fc7 [formerly c4f9671fc8 ]]
Former-commit-id: f21c8ffdf1f73a0d8a928f070ab289ca4878d61a [formerly 356b345064 ]
Former-commit-id: f7acce4d0e
|
2014-09-17 15:40:40 -05:00 |
|
Brian.Dyke
|
845a9cb390
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 80f677e1e3 [formerly 1c0d6624a3 ] [formerly e1c88f287a ] [formerly 80f677e1e3 [formerly 1c0d6624a3 ] [formerly e1c88f287a ] [formerly 57a361073d [formerly e1c88f287a [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]]]
Former-commit-id: 57a361073d
Former-commit-id: bf6931a113 [formerly 47feda6450 ] [formerly 56e8b90c211d77cd58bb224d0ec60bd67aba968d [formerly 4476b9d19e ]]
Former-commit-id: ef186b2221b07e34cc32e9dc0106aff32d72736c [formerly 7e53a1d558 ]
Former-commit-id: c95be437eb
|
2014-09-17 15:50:13 -04:00 |
|
Brian.Dyke
|
023f20ea22
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: cad0d0b87c [formerly 125760432b ] [formerly a155bbd8c1 ] [formerly cad0d0b87c [formerly 125760432b ] [formerly a155bbd8c1 ] [formerly 0f6b0f3d9d [formerly a155bbd8c1 [formerly 0813f96fbb673fdbbdb2c0f049ec722a80b212f9]]]]
Former-commit-id: 0f6b0f3d9d
Former-commit-id: fb5832202c [formerly 9db11b3211 ] [formerly 6b30d9e62c5e05c9c43be872b87a1541ccafcb00 [formerly e43ea5e966 ]]
Former-commit-id: 1aeafb2faa1a8732677b961b63c89438f90eeb16 [formerly 84a511359b ]
Former-commit-id: 76c056ce3f
|
2014-09-17 15:45:27 -04:00 |
|
Nate Jensen
|
07a3b864dd
|
Merge "Omaha #3638 Moved kml graphics extensions into own plugins separate from the kml core plugin" into omaha_14.4.1
Former-commit-id: ba96750715 [formerly c7710f39b0 ] [formerly 03c74e966d ] [formerly ba96750715 [formerly c7710f39b0 ] [formerly 03c74e966d ] [formerly 6225047ff0 [formerly 03c74e966d [formerly 0d36eda2778db9a2848fb84864181da0688df55f]]]]
Former-commit-id: 6225047ff0
Former-commit-id: 6f4c0c05de [formerly 81ce6a8206 ] [formerly 7db537bcbde091c8f7ed5f563218eff53dde4596 [formerly 5403b31f5d ]]
Former-commit-id: 60e86f6ffb8e64618eab1632acca979d67234639 [formerly c5a11bc792 ]
Former-commit-id: d0deab9b7c
|
2014-09-17 14:07:58 -05:00 |
|
Andrew Benak
|
b785480261
|
Omaha #3638 Moved kml graphics extensions into own plugins separate from the kml core plugin
Change-Id: I7b16a52cfee029fa10fba0ec837e8d05b4849d6b
Former-commit-id: a90e08d308 [formerly 2c0eb1b447 ] [formerly 898eaf114c ] [formerly a90e08d308 [formerly 2c0eb1b447 ] [formerly 898eaf114c ] [formerly d38d9ceaea [formerly 898eaf114c [formerly 511721cfcab0aa64bc1b3b82cbe025c433fab34a]]]]
Former-commit-id: d38d9ceaea
Former-commit-id: 690c5ab648 [formerly a040ccfe8e ] [formerly c9b73edcd4da968a607a8a9f6bb7d624e382e9e2 [formerly 6d9c357a8b ]]
Former-commit-id: 04ccf0bc9c187a52762191bfdf6cab84786b2f7c [formerly e88d5fdc3a ]
Former-commit-id: 48d3884e28
|
2014-09-17 14:06:02 -05:00 |
|
Zhidong.Hao
|
6ab5c8eacd
|
ASM #537 - fix for AvnFPS: Syntax failed to flag format error
Change-Id: I39615891fb92f876e06d13eb3232ee937ec9080a
Former-commit-id: 873e09a5f2 [formerly 8fadf3bf2c ] [formerly 237b09c2ad ] [formerly 873e09a5f2 [formerly 8fadf3bf2c ] [formerly 237b09c2ad ] [formerly 396519b17a [formerly 237b09c2ad [formerly 52d355b81fd7f7376d26f43ca6abe4d2ee744adf]]]]
Former-commit-id: 396519b17a
Former-commit-id: 28998ee947 [formerly 66df3687d6 ] [formerly ae22e7a99796a84993a76d3a6c99b04b7a72cc96 [formerly 078ef6a992 ]]
Former-commit-id: 6fc89fab28955827caac5c2b79381518f9970012 [formerly 17404d5145 ]
Former-commit-id: a79eb6705d
|
2014-09-17 15:02:13 -04:00 |
|
Brian.Dyke
|
cbe3c68b5b
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 967056afbb [formerly c44811098f ] [formerly cb7a266271 ] [formerly 967056afbb [formerly c44811098f ] [formerly cb7a266271 ] [formerly 97fc11f099 [formerly cb7a266271 [formerly dcfe2369455e6b7f27039418b090c9c577400a63]]]]
Former-commit-id: 97fc11f099
Former-commit-id: 19b21d9ccb [formerly 050fb83ec8 ] [formerly 2c2f21dc3030befe53cea6aa3c87d5ab9e85d7ba [formerly e8e2549284 ]]
Former-commit-id: b6b55a6c702deb69a0749bf152c7a57eb3e072fa [formerly 8f0d1e9dc5 ]
Former-commit-id: 484ebfd9c9
|
2014-09-17 14:39:56 -04:00 |
|
Brian.Dyke
|
4f94115115
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: bdffe16188 [formerly c2033ff569 ] [formerly 4bd417b313 ] [formerly bdffe16188 [formerly c2033ff569 ] [formerly 4bd417b313 ] [formerly 97dfb04eb6 [formerly 4bd417b313 [formerly 1f186fb314e78d93adefe03faaa71f348ee207c7]]]]
Former-commit-id: 97dfb04eb6
Former-commit-id: 16e4a65782 [formerly 17ccf38f99 ] [formerly e3583f269a86faa979baf8a54e1ad011ed8190f7 [formerly 2bea5c90a4 ]]
Former-commit-id: 3d7c5bc573c75d0777ff23aee85715dc1d4a5dce [formerly 91fe59509a ]
Former-commit-id: cdd2d4553b
|
2014-09-17 13:32:25 -04:00 |
|
Roger Ferrel
|
167f3f083c
|
Omaha #3609 Correct same spelling as in 14.3.1-backports
Former-commit-id: 083bb50f41 [formerly 88576d1bdf ] [formerly 7e4c964863 ] [formerly 083bb50f41 [formerly 88576d1bdf ] [formerly 7e4c964863 ] [formerly a560d254f8 [formerly 7e4c964863 [formerly 80c6046ef27f08bad8c7d11ddafcc6a1adaa6096]]]]
Former-commit-id: a560d254f8
Former-commit-id: 0f35905d05 [formerly bf7192f71e ] [formerly 3b48c63639c243c43c102123237c83cc71d55c78 [formerly b4d7c2ad5b ]]
Former-commit-id: a5a7b8bc4c3ba76b1da36c374578b1b4126341b0 [formerly 65811e5943 ]
Former-commit-id: 5b3d257154
|
2014-09-17 11:31:01 -05:00 |
|
Brian Clements
|
bebf8fee37
|
Omaha #3632 fixed index out of bounds for TCSResource
Change-Id: I1d0811d2565441a01b104a1ad2a1c1303c756907
Former-commit-id: dd1b5a2641 [formerly a1b3579cf5 ] [formerly 4a93d0e571 ] [formerly dd1b5a2641 [formerly a1b3579cf5 ] [formerly 4a93d0e571 ] [formerly 0808a6b662 [formerly 4a93d0e571 [formerly 1c96a60c25091ddec997f5d9e3b604c0fd7689bc]]]]
Former-commit-id: 0808a6b662
Former-commit-id: dbe8b27278 [formerly 520d4fdd5c ] [formerly b94c4bb733508e173f8fd3a435b2a6844004dee8 [formerly a410a42e4d ]]
Former-commit-id: fb41074a616c12296a61188254d1d930728a8b4f [formerly 8df79c9b1d ]
Former-commit-id: 179e35c5dd
|
2014-09-17 11:16:55 -05:00 |
|
Brian Clements
|
242b6b6c9a
|
Omaha #2707 LSR rework
removed dataURI column from DB
removed eventType from hdf5
eventType in DB now string
unknown event types now render direct
Change-Id: I24f5041f761758371dcef1fd1157be0bcf329e73
Former-commit-id: 9f4315eb5c [formerly 84f85d1436 ] [formerly 423421175f ] [formerly 9f4315eb5c [formerly 84f85d1436 ] [formerly 423421175f ] [formerly 6fd51c01fe [formerly 423421175f [formerly 9950454fbe4158bcfcb9d3ce25abafad4d012556]]]]
Former-commit-id: 6fd51c01fe
Former-commit-id: 3ab2f5bfc3 [formerly 34d9bee33d ] [formerly 8b4a5b288e44debf022bee24bf84490c234b485e [formerly c4abe5b471 ]]
Former-commit-id: b66bd7a958432ca80c654eb7a6b9f61fa3a85e54 [formerly 0944f06460 ]
Former-commit-id: eeda187c02
|
2014-09-17 10:57:07 -05:00 |
|
Qinglu.Lin
|
122ceb205d
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5
Former-commit-id: 7e6097f690 [formerly 4bce4db9ef ] [formerly 0e2be5afd8 ] [formerly 7e6097f690 [formerly 4bce4db9ef ] [formerly 0e2be5afd8 ] [formerly 5e93999662 [formerly 0e2be5afd8 [formerly e7ab29fbfebb1943e0b0702547dbd353367e797d]]]]
Former-commit-id: 5e93999662
Former-commit-id: 9f70edbb34 [formerly 6ef0e3bb6e ] [formerly a8ad02db889c2638f302a347fea519b0862584fe [formerly 94ca48dcdf ]]
Former-commit-id: b0c58a4e8b0cd34baed6965762135dcfe9cd113d [formerly 95bf760e81 ]
Former-commit-id: f3f0f4d5c6
|
2014-09-17 10:26:25 -04:00 |
|