Commit graph

6871 commits

Author SHA1 Message Date
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
Nate Jensen
6aa1a4164e Merge "Omaha #3009 make ffmp play nice with collaboration" into omaha_14.4.1
Former-commit-id: 0743eacea8 [formerly bf601df1e0] [formerly 8db243045c] [formerly 0743eacea8 [formerly bf601df1e0] [formerly 8db243045c] [formerly 53afb3815c [formerly 8db243045c [formerly b89acc052d5c0065e12c9e13cde1d4fffd115729]]]]
Former-commit-id: 53afb3815c
Former-commit-id: ea139e0258 [formerly 0a2823cda1] [formerly c9edbf0ca1eb577b8cc399fc8b5b984ffc9f258b [formerly 34ba7003f0]]
Former-commit-id: 5b19402846b129eb1d786e732daa54ad7c0087f9 [formerly c9d4c9750b]
Former-commit-id: 4931a17df2
2014-09-23 16:17:27 -05: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
7ed1664eb9 Omaha #3300 - Added another compiled nativeLib binary to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Former-commit-id: 4443c18763 [formerly 9891be174d] [formerly e09f3ab040] [formerly 4443c18763 [formerly 9891be174d] [formerly e09f3ab040] [formerly 6cf62253a8 [formerly e09f3ab040 [formerly 230f4413d69d25ca4e8cafc23ec80b3bb79fea63]]]]
Former-commit-id: 6cf62253a8
Former-commit-id: 8b600d9f2a [formerly d1c57e9e29] [formerly 30007aab674ac35d523aaa25b526b51811127bd1 [formerly 653369048a]]
Former-commit-id: 3db1c34b13477244926bf45b3295ef4c73889877 [formerly 2c07c98fc7]
Former-commit-id: 47b52b025a
2014-09-23 15:30:55 -05:00
Nate Jensen
db1c7f10ad Merge "Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools" into omaha_14.4.1
Former-commit-id: 8084bfdf35 [formerly 5582df03b9] [formerly c9033dc300] [formerly 8084bfdf35 [formerly 5582df03b9] [formerly c9033dc300] [formerly 3ae54c26c6 [formerly c9033dc300 [formerly 21ad2f0d0229235495edc9319e8493d8a6b4d6b4]]]]
Former-commit-id: 3ae54c26c6
Former-commit-id: 32e2867235 [formerly 2fe7f33be9] [formerly 1f340ab84b8a4915735e2a0102fa875185f020c2 [formerly 64edefbf51]]
Former-commit-id: 1222728ecf9b53877262696bb38a3329bcdaf72d [formerly 0a72a384a8]
Former-commit-id: 79609628d0
2014-09-23 12:15:56 -05:00
Mark Peters
da6355c8cd Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools
Change-Id: I65fee949e595b76be5c998dcd550b287928a1d65

Former-commit-id: bfd99d02af [formerly 27f5ae502d] [formerly bd5996a599] [formerly bfd99d02af [formerly 27f5ae502d] [formerly bd5996a599] [formerly 9176913542 [formerly bd5996a599 [formerly 1350720111ceeb83893c5c0129eb41d662d16211]]]]
Former-commit-id: 9176913542
Former-commit-id: 3354a82bbf [formerly 6ce445d20b] [formerly 41c20710a323fd74fef56cf65f05fc7f694c60e8 [formerly c9e8228954]]
Former-commit-id: 62734f967b809cdddbabef3d398dab3f8f6a4d43 [formerly 757ecb423c]
Former-commit-id: 71fdd40be2
2014-09-23 12:12:22 -05:00
Richard Peter
ceb2418877 Merge "Omaha #3591 Convert scripts to use DAF." into omaha_14.4.1
Former-commit-id: a69dc43d55 [formerly ed84871cc8] [formerly c3880f78b2] [formerly a69dc43d55 [formerly ed84871cc8] [formerly c3880f78b2] [formerly f474c55155 [formerly c3880f78b2 [formerly f782f11484b5aa1c9f64028a6d9241fa5b593453]]]]
Former-commit-id: f474c55155
Former-commit-id: 7fbcdfbc16 [formerly 88fa9da7d4] [formerly 191ba72050067eed3dc6ae50b4a8e9da03407ab8 [formerly f7772790b7]]
Former-commit-id: 56c8bf59a69e7f6637cc24bdce34bbc5b7387906 [formerly 591eca891c]
Former-commit-id: 2ccb9e94d9
2014-09-23 12:09:05 -05:00
Steve Harris
60c4b1abbd Omaha #3300 - Added compiled nativeLib binaries to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Former-commit-id: 0a839bd50a [formerly f29bef4f34] [formerly 26155d4251] [formerly 0a839bd50a [formerly f29bef4f34] [formerly 26155d4251] [formerly c8bee38fc7 [formerly 26155d4251 [formerly 785a6cb7ef5856e0bc0beb3fcf5657f74934111b]]]]
Former-commit-id: c8bee38fc7
Former-commit-id: 80da0b9dbb [formerly a2e1cdf346] [formerly 4c693c55731d9714b20a8b7df612208d26ec22b0 [formerly 3cca5caf09]]
Former-commit-id: ef785e780f9a7ca439f15dbd5fac467b861b5d84 [formerly 363467f328]
Former-commit-id: bc71a024da
2014-09-23 12:02:08 -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
Nathan Bowler
592291421d Omaha #3591 Convert scripts to use DAF.
Change-Id: I05978c21d74949e2654dcfd62cb40a6738392a66

Former-commit-id: 2897ec38d9 [formerly ac4d93f32e] [formerly 87865f6a95] [formerly 2897ec38d9 [formerly ac4d93f32e] [formerly 87865f6a95] [formerly 36bb7fcd57 [formerly 87865f6a95 [formerly b5838370b90da43f953c5189a161640b3239418f]]]]
Former-commit-id: 36bb7fcd57
Former-commit-id: 418cb8a1d3 [formerly 0577dd9983] [formerly 3d1fd8db3a4b85d5a5fbec20ffae22c2b1833de5 [formerly c477e39037]]
Former-commit-id: 43ffee403cacf0cde8c60bf3032956a0084ec657 [formerly 71b0c2d045]
Former-commit-id: a7a8058660
2014-09-23 11:42:35 -04:00
Nate Jensen
b7914e42b3 Merge "Omaha #3356 fix apps_dir setting detection in viz/cave" into omaha_14.4.1
Former-commit-id: 69d77c36b3 [formerly 3e82c0f768] [formerly 39f330b583] [formerly 69d77c36b3 [formerly 3e82c0f768] [formerly 39f330b583] [formerly 29ee81f50c [formerly 39f330b583 [formerly 39c26499805dc23b232397a2f9349ed17564ae13]]]]
Former-commit-id: 29ee81f50c
Former-commit-id: 85f93c43ae [formerly 991276ab34] [formerly 1dd7f791470b7e049c7809659e2c71e1daedb283 [formerly 45e8f476ed]]
Former-commit-id: 47e70d58e2322d22aad6e25365f8fe9c080aeb90 [formerly 30f1398f14]
Former-commit-id: bdf1411f78
2014-09-23 09:52:22 -05:00
Nathan Bowler
5d18489ef6 Omaha #3591 Adding original, unaltered scripts.
Change-Id: Ia1f60b645d283674985be542054c4dd20c2c5fa8

Former-commit-id: 08bdd905e2 [formerly 53495a767b] [formerly 1a0aa971ef] [formerly 08bdd905e2 [formerly 53495a767b] [formerly 1a0aa971ef] [formerly ce15b03ce4 [formerly 1a0aa971ef [formerly ee00a93cac391a1c8e0f9236815b5ed270e9f9fb]]]]
Former-commit-id: ce15b03ce4
Former-commit-id: 8bf2c881cd [formerly 416c83769d] [formerly 508bacd573bd9a85594fa06946549eb02bcda889 [formerly 01ed47b7be]]
Former-commit-id: 619402014606e95d54a4f09ef5233f0df76fb494 [formerly 41f434fb46]
Former-commit-id: f6abb030d5
2014-09-23 10:43:01 -04:00
Nate Jensen
75d4bf69a5 Merge "Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools" into omaha_14.4.1
Former-commit-id: de8cddaf94 [formerly 54fa54ef31] [formerly 2a675e48dd] [formerly de8cddaf94 [formerly 54fa54ef31] [formerly 2a675e48dd] [formerly 16f91ce391 [formerly 2a675e48dd [formerly 677421b80157aa32c2ccf484eebe8e0a6a4c304f]]]]
Former-commit-id: 16f91ce391
Former-commit-id: 0a922597fa [formerly 96f1e6e690] [formerly 662848376236854c11da9a2af87e2ee2d9a8f668 [formerly 1b20c02c9c]]
Former-commit-id: aa58e602deddb36b31d2a6f807a3be26664c36c9 [formerly de1d5f8477]
Former-commit-id: 13e59f358b
2014-09-23 09:00:59 -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
Nate Jensen
aee713656e Omaha #3356 fix ingestDat startup issues
Change-Id: I47b66fd753513230849dd2710f518511895602fc

Former-commit-id: a2352c7c09 [formerly b7f93f7a4d] [formerly 9ac3ad9890] [formerly a2352c7c09 [formerly b7f93f7a4d] [formerly 9ac3ad9890] [formerly cbd5b270b5 [formerly 9ac3ad9890 [formerly f5ca6846eee39074abc856a1d2c9f6ed58ae0cff]]]]
Former-commit-id: cbd5b270b5
Former-commit-id: 5983f26c8c [formerly 6e6f38b2fb] [formerly bb2083b2d0f208b01eb96660d61a89bd3112e1fa [formerly 41945b820a]]
Former-commit-id: 7c69cf6004636128dbb9752c0cba4c15632a779f [formerly 8ea5d99bf4]
Former-commit-id: c489974c74
2014-09-22 10:59:10 -05: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
Mark Peters
32aae0aa64 Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools
Change-Id: I95e881042e09a18f45b4410a76dbcf828dac0d4f

Former-commit-id: d065b2610f [formerly 68044d2dd7] [formerly 3f1e21107b] [formerly d065b2610f [formerly 68044d2dd7] [formerly 3f1e21107b] [formerly c5da5ccb9b [formerly 3f1e21107b [formerly 4632e2694c2d06c6b61ae9b61eee3b3584c6bebc]]]]
Former-commit-id: c5da5ccb9b
Former-commit-id: 5866b1672b [formerly 01fa82955b] [formerly 68f23f587842499a379ea50ee1e7d61c11b6329e [formerly edc2745d1f]]
Former-commit-id: 2cb2c28c4886558bdf857b3cad7623d7c1988033 [formerly 54640500a6]
Former-commit-id: 11a05cae90
2014-09-19 14:02:54 -05: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
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
Richard Peter
311815b2b6 Merge "Omaha #3593 Change scripts to use DAF." into omaha_14.4.1
Former-commit-id: e49229985e [formerly 3fb7554532] [formerly 1d9c11a889] [formerly e49229985e [formerly 3fb7554532] [formerly 1d9c11a889] [formerly 1c46a59a35 [formerly 1d9c11a889 [formerly edace9e4909f83ac213bbd29c28352e1bf4cc11f]]]]
Former-commit-id: 1c46a59a35
Former-commit-id: 961be7330f [formerly e0e7284078] [formerly cfcb23efcd3554d760685c4f888fcfae9a338bb6 [formerly 0247f9305d]]
Former-commit-id: 0df2e88c68cd676a08a817a16c4a7d929e47ad0c [formerly 52161887eb]
Former-commit-id: 7da16a6d62
2014-09-17 22:28:03 -05: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
Nate Jensen
bd467f438b Merge "Omaha #3623 Created command line utilities to activate/deactivate sites" into omaha_14.4.1
Former-commit-id: 08b017edad [formerly 7d574ec247] [formerly dc49c41b39] [formerly 08b017edad [formerly 7d574ec247] [formerly dc49c41b39] [formerly 51bbc3351b [formerly dc49c41b39 [formerly fba50e36f951594f6c8bb069ceb9b8a82a02ad89]]]]
Former-commit-id: 51bbc3351b
Former-commit-id: 7c5e671e08 [formerly 0baaaf933f] [formerly 23935f6d34aa764e988131a22b0188d635cb3d12 [formerly e0784838ee]]
Former-commit-id: 83008c4b72abaf19d6c9abb68b18f43eab6724db [formerly b7b86fafd7]
Former-commit-id: f3350006ed
2014-09-17 15:27:50 -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
Brian.Dyke
a84a4182d1 VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so
Former-commit-id: 5b36acf3d5 [formerly 9d2eaef5e7] [formerly 546b43dff6] [formerly 5b36acf3d5 [formerly 9d2eaef5e7] [formerly 546b43dff6] [formerly 05145d2f0d [formerly 546b43dff6 [formerly 0448deecda7c53ac65bc66bc9751ec0e7f83eee1]]]]
Former-commit-id: 05145d2f0d
Former-commit-id: 6aa73f47d1 [formerly 75284bdd1b] [formerly d9b47d26d3cd9aa014c6fb2c48603d7bf314e245 [formerly 60a61086d5]]
Former-commit-id: 33bb336064744904936fe8d28c6d356b02890596 [formerly 5516c71d4e]
Former-commit-id: 6f708b2b87
2014-09-17 15:39:57 -04:00
Ron Anderson
9afbd68c1e Omaha #3623 Created command line utilities to activate/deactivate sites
Change-Id: I2bc0a10caf51129af06aa4ae4cb1f0471bc49408

Former-commit-id: c3d77cb778 [formerly f0e06502ee] [formerly e8db5a1bbf] [formerly c3d77cb778 [formerly f0e06502ee] [formerly e8db5a1bbf] [formerly b09244975e [formerly e8db5a1bbf [formerly 670a9bd71874fbd6fecd0c9df5567ad342892333]]]]
Former-commit-id: b09244975e
Former-commit-id: 20d196a8f6 [formerly 15dabca55b] [formerly f7edf2672beb4969205b214abd1ea2a718a1a99d [formerly 9a0371457a]]
Former-commit-id: 2c1d5e26e39211ae96569eb1ef32a6a22a2b473c [formerly f71d1932bd]
Former-commit-id: ae8e1937a9
2014-09-17 14:35:47 -05: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
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
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
Richard Peter
e6ffcaa84b Merge "Omaha #2707 LSR rework" into omaha_14.4.1
Former-commit-id: b81ebfda25 [formerly 1304c2b343] [formerly cf7fee3b58] [formerly b81ebfda25 [formerly 1304c2b343] [formerly cf7fee3b58] [formerly e2bd527996 [formerly cf7fee3b58 [formerly e9636595208e033882c6f7ec85329845a99cb66b]]]]
Former-commit-id: e2bd527996
Former-commit-id: f64cb6aef3 [formerly 61d4471b80] [formerly dc9f81bd7757d19105dc5ecf45811b86e5da3886 [formerly 5e68587405]]
Former-commit-id: 1fe3be57d5709686d793eb6dc7c1c3ac10c4ca71 [formerly 74a99c6344]
Former-commit-id: 8182268b50
2014-09-17 11:22:45 -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
Brian Clements
52b815fafc Omaha #3015 improved exception handling for MPE lightning
Change-Id: I3ab01d811bf49dbeced48d43744b93d470815636

Former-commit-id: 6cd4e130fb [formerly 9aa1cb03e1] [formerly eccfebaa96] [formerly 6cd4e130fb [formerly 9aa1cb03e1] [formerly eccfebaa96] [formerly 246dcda707 [formerly eccfebaa96 [formerly 57f997f93e7e063ad6f24074ab3d1b8f02962bb8]]]]
Former-commit-id: 246dcda707
Former-commit-id: 627d27ceea [formerly 678d98f5d8] [formerly bb2df4d2de23d7b91d21601a83697555569ad3ae [formerly 86361da448]]
Former-commit-id: 8072930d2600cc401e10dfb6ed94bd7e3644f100 [formerly 4bbad8b2f1]
Former-commit-id: c0898880f6
2014-09-17 10:30:08 -05:00
Nathan Bowler
d659a70db1 Omaha #3593 Change scripts to use DAF.
Change-Id: I2fcf3b455335826cdf9cd8d3755c4dd72cba8974

Former-commit-id: 1b7527df2e [formerly 05148089db] [formerly 71435084ef] [formerly 1b7527df2e [formerly 05148089db] [formerly 71435084ef] [formerly e3d47f6016 [formerly 71435084ef [formerly 3daf987c89f4ed6e943dd7a9394f5617ec5690bf]]]]
Former-commit-id: e3d47f6016
Former-commit-id: 3c2fb1bb59 [formerly 3397c0e9a0] [formerly fce505e01e101f53741e8c768c15cd054ccd5593 [formerly 14fbd034c3]]
Former-commit-id: cd9bcd754ce7b7cdde68b6bf5acefc73b816ff6a [formerly fc0791687a]
Former-commit-id: 9fbaeeb68f
2014-09-17 10:24:48 -04:00
Nate Jensen
e157514bcf Merge "Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin" into omaha_14.4.1
Former-commit-id: bd1aba7a24 [formerly c52a832f1a] [formerly 6273bfd13e] [formerly bd1aba7a24 [formerly c52a832f1a] [formerly 6273bfd13e] [formerly cdcaf9962d [formerly 6273bfd13e [formerly 0ff3f331f61b98e5132dc497d247a61828a8fdf0]]]]
Former-commit-id: cdcaf9962d
Former-commit-id: 904a012a20 [formerly 632fa47154] [formerly 489f80b726ea7ca65e35ab6e1540328e707c3322 [formerly bfa3d7d8e2]]
Former-commit-id: f9cf4b460e00ce82c25e80768324398afaafc856 [formerly 8133f5958e]
Former-commit-id: 9bfbabcd4d
2014-09-16 17:40:58 -05:00
Ron Anderson
1afa5a67a5 Issue #3592 Fix issue with priority of file updates
Change-Id: I1404fc8f3c03fab7e828bf40ee01c8d03cfbda58

Former-commit-id: ac096c3f9f [formerly f560ef000f] [formerly f0c5e465b8] [formerly ac096c3f9f [formerly f560ef000f] [formerly f0c5e465b8] [formerly d8471fce1f [formerly f0c5e465b8 [formerly 554ea4118615055d4f2e0d80c58788f55c4b41e9]]]]
Former-commit-id: d8471fce1f
Former-commit-id: 8003c931ba [formerly 3976f40935] [formerly c66c2345adbbdcab0c3a3d1fea23109b13aa61fd [formerly 28ad0619d2]]
Former-commit-id: 03ec8c6a72165e0a83f46c47f3d6ee06532333ce [formerly d858187c73]
Former-commit-id: d5f59333f8
2014-09-16 17:25:43 -05:00