Slav Korolev
|
d6ef83e619
|
Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 8175aad0bf [formerly 2b877529ce] [formerly 8175aad0bf [formerly 2b877529ce] [formerly 16ec392c12 [formerly 0172e8f27b646a965e472f969f112a4e170d9f41]]]
Former-commit-id: 16ec392c12
Former-commit-id: fec8eb4fae [formerly d8ebeb4778]
Former-commit-id: a66dd879c7
|
2014-06-12 12:24:34 -04:00 |
|
Mike Duff
|
a87ac48a53
|
Omaha #3269 - Fix editing of Notifiers before saving
Amend - Remove save confirmation dialog, rename buttons
Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4
Former-commit-id: 522d3c70f2 [formerly 80922824a3] [formerly 522d3c70f2 [formerly 80922824a3] [formerly c920a24300 [formerly 47d57692c81757a8b8c0d3217e21f701f18cdf2c]]]
Former-commit-id: c920a24300
Former-commit-id: 0bdefaabdd [formerly b15b6514fd]
Former-commit-id: 5e0aa25048
|
2014-06-12 11:21:15 -05:00 |
|
Roger Ferrel
|
06808134bf
|
Omaha #3252 Fix bug in __makeHader to prevent unexpected exception.
Former-commit-id: 09ae36d8de [formerly 960772ea44] [formerly 09ae36d8de [formerly 960772ea44] [formerly 42fe1bf5b2 [formerly 787261f13c47b5de81b2e7c4f861645614a11f1f]]]
Former-commit-id: 42fe1bf5b2
Former-commit-id: c43758bdbb [formerly 95d7540d05]
Former-commit-id: 5e9ed74eac
|
2014-06-12 10:08:51 -05:00 |
|
Ben Steffensmeier
|
993da07002
|
Omaha #3217 Add always prompt option to thinclient connectivity dialog.
Former-commit-id: 13e618cf89 [formerly b8f331bfba] [formerly 13e618cf89 [formerly b8f331bfba] [formerly c70462fb8a [formerly aac3fdd00b429932d9cfa5d950f9729ace54a933]]]
Former-commit-id: c70462fb8a
Former-commit-id: 726c91ed9e [formerly 96591c2ddb]
Former-commit-id: f6ea37ef66
|
2014-06-11 17:00:16 -05:00 |
|
Ben Steffensmeier
|
2aebff4f06
|
Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: 5a4f7a1fd4 [formerly f292f204c9] [formerly 5a4f7a1fd4 [formerly f292f204c9] [formerly fc25774506 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]]
Former-commit-id: fc25774506
Former-commit-id: 217734a2ba [formerly 94b465fa15]
Former-commit-id: 3c8b94e08a
|
2014-06-11 13:45:42 -05:00 |
|
Nate Jensen
|
aa25da74a0
|
Merge "Omaha #3266 remove unused attributes and elements from baseline menu xml files" into omaha_14.4.1
Former-commit-id: 17456be16c [formerly 04a6c1d5b7] [formerly 17456be16c [formerly 04a6c1d5b7] [formerly 4354bac2d5 [formerly b97df26a25976d58409dad8e43b1ca3ce7471133]]]
Former-commit-id: 4354bac2d5
Former-commit-id: d6e35301cf [formerly 753b7ddd5c]
Former-commit-id: 717523bf0e
|
2014-06-11 13:09:34 -05:00 |
|
Ben Steffensmeier
|
3db0af5561
|
Omaha #2061 Remove IDecoderGettable from all AWIPS2 Raytheon PDOs.
Former-commit-id: a96199cc47 [formerly d838ecc734] [formerly a96199cc47 [formerly d838ecc734] [formerly 30415ae8c5 [formerly b6c63e5791a2438253d6ff039b5164c61105a941]]]
Former-commit-id: 30415ae8c5
Former-commit-id: 08a1e07918 [formerly eb7cf7e8da]
Former-commit-id: 02c4332c6a
|
2014-06-11 12:38:35 -05:00 |
|
Nate Jensen
|
fa9e075a44
|
Omaha #3266 remove unused attributes and elements from baseline menu xml
files
Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01
Former-commit-id: 23f3a15f31 [formerly 205e491d71] [formerly 23f3a15f31 [formerly 205e491d71] [formerly 955e115c00 [formerly 797504a970ec39c4fd56c9e0d51b292acfceea1b]]]
Former-commit-id: 955e115c00
Former-commit-id: f9d4da37b1 [formerly f634182937]
Former-commit-id: 70589056d1
|
2014-06-10 18:30:14 -05:00 |
|
Nate Jensen
|
f5c593071a
|
Merge "Omaha #2061 Delete PlotResource, rename PlotResource2." into omaha_14.4.1
Former-commit-id: be169a7f63 [formerly 6890ee0920] [formerly be169a7f63 [formerly 6890ee0920] [formerly 10207907d8 [formerly b0903898a40916383f88b920e87dfc072d9cafa9]]]
Former-commit-id: 10207907d8
Former-commit-id: 789d9be951 [formerly 33b22ece81]
Former-commit-id: 57f48654ac
|
2014-06-10 17:14:53 -05:00 |
|
Ben Steffensmeier
|
c0b8a49ee9
|
Omaha #3263 Synchronize dataTimes of storm track resources.
Former-commit-id: 8783e9e23c [formerly eff1921f70] [formerly 8783e9e23c [formerly eff1921f70] [formerly cad15768cc [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]]]
Former-commit-id: cad15768cc
Former-commit-id: e4ac81c0e9 [formerly b02383f878]
Former-commit-id: f60667703f
|
2014-06-10 16:34:44 -05:00 |
|
Ben Steffensmeier
|
178b7509db
|
Omaha #2061 Delete PlotResource, rename PlotResource2.
Former-commit-id: bcc7243358 [formerly 1e37d669d8] [formerly bcc7243358 [formerly 1e37d669d8] [formerly a98872cb89 [formerly b569c7c3e175ed1519576aea63048c3f675d3875]]]
Former-commit-id: a98872cb89
Former-commit-id: bbcec7c004 [formerly d40c6fd625]
Former-commit-id: 6a5b6dcf8e
|
2014-06-10 15:59:15 -05:00 |
|
Nate Jensen
|
4299caf439
|
Merge "Omaha #3226 added total lightning decoder" into omaha_14.4.1
Former-commit-id: a8022b8363 [formerly c8b6324240] [formerly a8022b8363 [formerly c8b6324240] [formerly 19bef8d080 [formerly ffa3e069c0beb5678ecb863b2950556d8c289ae1]]]
Former-commit-id: 19bef8d080
Former-commit-id: 87abeb25b9 [formerly 1d619bcf95]
Former-commit-id: 17e3c5f898
|
2014-06-09 09:38:50 -05:00 |
|
Brian Clements
|
8046cbc417
|
Omaha #3226 added total lightning decoder
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning
Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3
Former-commit-id: 2e445986e2 [formerly c278000764] [formerly 2e445986e2 [formerly c278000764] [formerly f39896b2d1 [formerly e2583481a77d08249030838ebd52eed6e54b2986]]]
Former-commit-id: f39896b2d1
Former-commit-id: 77b1f85fe1 [formerly b98a3494fe]
Former-commit-id: ca1b869647
|
2014-06-06 14:39:57 -05:00 |
|
Nate Jensen
|
10350a1337
|
Merge "Omaha #3232 Radar code improvements." into omaha_14.4.1
Former-commit-id: 5e9faea6e7 [formerly 3b324093ae] [formerly 5e9faea6e7 [formerly 3b324093ae] [formerly 920e53628b [formerly 22a5da1feff7e30ea0408f089305d95657befad2]]]
Former-commit-id: 920e53628b
Former-commit-id: f2d753fa64 [formerly c0f047b24f]
Former-commit-id: 24f7247805
|
2014-06-05 17:38:32 -05:00 |
|
Ben Steffensmeier
|
dc5a927bb8
|
Omaha #3232 Radar code improvements.
Former-commit-id: 3eb6b79c56 [formerly 8587b9b43b] [formerly 3eb6b79c56 [formerly 8587b9b43b] [formerly 26325b57be [formerly 696f45d67c5e5b02183f97cfcc139db017f01848]]]
Former-commit-id: 26325b57be
Former-commit-id: 4f83edfa72 [formerly b8fe181c9a]
Former-commit-id: 9e97750df2
|
2014-06-05 14:53:25 -05:00 |
|
Roger Ferrel
|
b575bb7de2
|
Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data.
Change-Id: Ide97fbfd93bf06a6d708bf6fbd74349000ba2ed5
Former-commit-id: 7510cc23af [formerly e1c011b157] [formerly 7510cc23af [formerly e1c011b157] [formerly 10e7a33f08 [formerly 3e976b7ed5cf46687bbb76073e53f35ffc2c2812]]]
Former-commit-id: 10e7a33f08
Former-commit-id: e799ce4c59 [formerly aa085d9e59]
Former-commit-id: 050c2e87e7
|
2014-06-04 08:14:06 -05:00 |
|
Brian.Dyke
|
cdbcdb6cbd
|
Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: feb26ee9b7 [formerly 61b206be0b] [formerly feb26ee9b7 [formerly 61b206be0b] [formerly 3919c9ec2f [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]]
Former-commit-id: 3919c9ec2f
Former-commit-id: 8f6e365ece [formerly 244467210c]
Former-commit-id: 75c6886f61
|
2014-06-04 07:46:16 -04:00 |
|
Kenneth Sperow
|
ca67a59e23
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8
Former-commit-id: a59743ebe0 [formerly c302ef8967] [formerly a59743ebe0 [formerly c302ef8967] [formerly f2a738cc25 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]]
Former-commit-id: f2a738cc25
Former-commit-id: 1ba5f0a3c4 [formerly ca913b6159]
Former-commit-id: 3e94502542
|
2014-06-03 20:55:29 -07:00 |
|
brian.dyke
|
65f4a41200
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 789482b0e3 [formerly 79f866fb17] [formerly 789482b0e3 [formerly 79f866fb17] [formerly b3d95ca18d [formerly 2d4751c000176447d28b284337fb23a60cb19cd1]]]
Former-commit-id: b3d95ca18d
Former-commit-id: 05dfb0b2a5 [formerly 76cbdf64ff]
Former-commit-id: 21721fd935
|
2014-06-03 16:14:16 -04:00 |
|
Ben Steffensmeier
|
f403929612
|
Omaha #3163 Fix collaboration string differencing
Former-commit-id: 2c534e177e [formerly ca2210b3e7] [formerly 2c534e177e [formerly ca2210b3e7] [formerly 310e6562e6 [formerly e6f30c822de26bafae339a8871c4ba98100e6d1a]]]
Former-commit-id: 310e6562e6
Former-commit-id: 2b82c39a59 [formerly 72f1d7c950]
Former-commit-id: b40e97f5ac
|
2014-06-03 13:51:46 -05:00 |
|
Ron Anderson
|
b98936356f
|
Omaha #3052 Improved TopoQuery error handling to throw exceptions with useful error messages.
Change-Id: Ic181682611801ea244b986e8a2ce1400c4dc15d1
Former-commit-id: bd50ae9854 [formerly 3f169399b8] [formerly bd50ae9854 [formerly 3f169399b8] [formerly 304364e356 [formerly 0d42d4fdc56122c3df912c93e5e09b0ab28c1b37]]]
Former-commit-id: 304364e356
Former-commit-id: 060b0221fa [formerly 3ff441f9da]
Former-commit-id: 7171bc6f0a
|
2014-06-02 17:14:18 -05:00 |
|
Nate Jensen
|
cf3a5b9a53
|
Merge "Omaha #2918 Synchronize mosaic dataTimes." into omaha_14.4.1
Former-commit-id: 4be10cf1e6 [formerly d94a040f29] [formerly 4be10cf1e6 [formerly d94a040f29] [formerly a862846e15 [formerly 4abb30354ef4f6c6520ee993a66371656db0db9f]]]
Former-commit-id: a862846e15
Former-commit-id: 711661870f [formerly 1f4daca6e3]
Former-commit-id: ba546c3001
|
2014-06-02 12:44:17 -05:00 |
|
Steve Harris
|
7eabeb7ad6
|
Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/esb/conf/modes.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
Former-commit-id: 647cd97e29 [formerly 7fec0d039c] [formerly 647cd97e29 [formerly 7fec0d039c] [formerly 455eb8b39d [formerly 45250149681f057cf168f4d3cb27276279f62c05]]]
Former-commit-id: 455eb8b39d
Former-commit-id: 373c816e6a [formerly ec743199f1]
Former-commit-id: cbceb4ea62
|
2014-06-02 11:21:46 -05:00 |
|
Ben Steffensmeier
|
25b2aeeed2
|
Omaha #2918 Synchronize mosaic dataTimes.
Former-commit-id: 93ce7ddb33 [formerly 8a117864d8] [formerly 93ce7ddb33 [formerly 8a117864d8] [formerly b078baf67d [formerly c4d8ed9d0d7eb4c17d8a0922302a3fc50a0ae383]]]
Former-commit-id: b078baf67d
Former-commit-id: a97f9cd7e6 [formerly b4e1a98e23]
Former-commit-id: cbe8c64e73
|
2014-06-02 10:41:45 -05:00 |
|
Steve Harris
|
9aa3a5a035
|
Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
Former-commit-id: 4e26e224fd [formerly 65a3390a6a] [formerly 4e26e224fd [formerly 65a3390a6a] [formerly 3bde6b3e41 [formerly ee696cb24c8d72f0562126a131824e958b88f090]]]
Former-commit-id: 3bde6b3e41
Former-commit-id: 0edb16b05e [formerly c3deafc840]
Former-commit-id: 46b7122d56
|
2014-06-02 07:31:14 -05:00 |
|
Brian.Dyke
|
106a921a4c
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: de2df4cb6f [formerly b8ba378862] [formerly de2df4cb6f [formerly b8ba378862] [formerly c6244e1950 [formerly dec7b6fa091cab098b89a51551fa46b9f28b959b]]]
Former-commit-id: c6244e1950
Former-commit-id: 30f72a9337 [formerly 6edbd149a5]
Former-commit-id: 45deec5df6
|
2014-06-02 07:01:37 -04:00 |
|
Ron Anderson
|
14f0f927bf
|
Omaha #2841 Fix errors when formatters fail to queue due to pending limit.
Change-Id: Icf70e25369a23b7b554718cf235feda02e615f0d
Former-commit-id: 916e607254 [formerly 1108744b40] [formerly 916e607254 [formerly 1108744b40] [formerly 22d67fcad1 [formerly b15cb1632b58c415399ccc8dee6cf2c13140355f]]]
Former-commit-id: 22d67fcad1
Former-commit-id: 808254cd31 [formerly 33abe4a8d3]
Former-commit-id: ecaa8ab0a9
|
2014-05-30 10:47:28 -05:00 |
|
Brian.Dyke
|
9351315fd6
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: a0a879be7d [formerly a8737e18f0] [formerly a0a879be7d [formerly a8737e18f0] [formerly 3f1e12effc [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]
Former-commit-id: 3f1e12effc
Former-commit-id: 3961c75ecd [formerly 66aacd6578]
Former-commit-id: a23d371522
|
2014-05-30 10:46:25 -04:00 |
|
brian.dyke
|
45dd00f016
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2c2bb61e95 [formerly 95c5dc49c1] [formerly 2c2bb61e95 [formerly 95c5dc49c1] [formerly 03cc2fbbfb [formerly 2e170e3e328804a56f65de7cec0f0e89d3f1aba4]]]
Former-commit-id: 03cc2fbbfb
Former-commit-id: b6623af1f7 [formerly e09bd1d283]
Former-commit-id: 3f9ac5ba24
|
2014-05-30 10:09:00 -04:00 |
|
Ron Anderson
|
9d6658f1e9
|
Merge "Omaha #2841 Separate queuing of text formatters and product scripts." into omaha_14.4.1
Former-commit-id: 27a9790684 [formerly 8309a5656a] [formerly 27a9790684 [formerly 8309a5656a] [formerly 7df866b471 [formerly e13f80b81df762d6658cce9ad534dc499791ba46]]]
Former-commit-id: 7df866b471
Former-commit-id: f1a6e6735c [formerly ff31990a13]
Former-commit-id: 30495f52db
|
2014-05-29 18:50:52 -05:00 |
|
Ron Anderson
|
0c06544416
|
Omaha #2841 Separate queuing of text formatters and product scripts.
Change-Id: I4bfab25d4563914e7390b59d1717e8c82b016eb8
Former-commit-id: ce4047869c [formerly a9f3b486f3] [formerly ce4047869c [formerly a9f3b486f3] [formerly 8e1f4331da [formerly 216be7d4dd6da9aefbdd6c55e9fd09f1a60bc53a]]]
Former-commit-id: 8e1f4331da
Former-commit-id: 4d32cb561d [formerly f765c74e5e]
Former-commit-id: 114532dd8d
|
2014-05-29 16:55:02 -05:00 |
|
Richard Peter
|
aaab5e310f
|
Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289
Former-commit-id: 3beef299b1 [formerly 558699a370] [formerly 3beef299b1 [formerly 558699a370] [formerly e2288769d3 [formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]]]
Former-commit-id: e2288769d3
Former-commit-id: 121f0e00a4 [formerly 220f7aa97a]
Former-commit-id: 8ba13f812e
|
2014-05-29 15:50:59 -05:00 |
|
Steve Harris
|
b09109b66e
|
Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository
Change-Id: Ib313d71006c3d23a76c1589fded47102fea80b9a
Former-commit-id: f857812561 [formerly 79d5592fdf] [formerly f857812561 [formerly 79d5592fdf] [formerly 5bc251beaa [formerly c944b3b98f68b8f65b853fb244002e3382dc38a2]]]
Former-commit-id: 5bc251beaa
Former-commit-id: 4af6e9f137 [formerly c830097b13]
Former-commit-id: 77e18c2e9a
|
2014-05-29 13:42:09 -05:00 |
|
Roger Ferrel
|
c882871747
|
Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085
Former-commit-id: eebc5096b2 [formerly 44a23b4500] [formerly eebc5096b2 [formerly 44a23b4500] [formerly 825e2c1b19 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]]]
Former-commit-id: 825e2c1b19
Former-commit-id: 73be1f66e9 [formerly 15545c5239]
Former-commit-id: 6c78b5e04c
|
2014-05-29 12:33:15 -05:00 |
|
Nate Jensen
|
d1f08dcaf1
|
Merge "Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager." into omaha_14.4.1
Former-commit-id: 6fc643af39 [formerly 3e174fe39c] [formerly 6fc643af39 [formerly 3e174fe39c] [formerly 8cc13d8334 [formerly db3ff4b3bf81cbea49169369be01ce5c919157fd]]]
Former-commit-id: 8cc13d8334
Former-commit-id: c7da2eec51 [formerly a921570418]
Former-commit-id: fda484c9ff
|
2014-05-28 12:43:12 -05:00 |
|
Ron Anderson
|
c237fd2699
|
Merge "Omaha #3110 Permanent fix for mutable database creation." into omaha_14.4.1
Former-commit-id: 8b580a891d [formerly da0a173698] [formerly 8b580a891d [formerly da0a173698] [formerly 8b5daad4db [formerly 3869a36a6cad1674e8ec493d03937c21ddde7f21]]]
Former-commit-id: 8b5daad4db
Former-commit-id: 0198ceb40a [formerly 191283e96d]
Former-commit-id: 81c044d476
|
2014-05-28 11:59:51 -05:00 |
|
Nate Jensen
|
d7cba4a465
|
Merge "Omaha #3133 Removed dead hydro code and related dependencies" into omaha_14.4.1
Former-commit-id: 719c53a044 [formerly 905fa8f283] [formerly 719c53a044 [formerly 905fa8f283] [formerly e7dc89cddd [formerly 55cf25f0671f17e667f7c785f3580a93267f8790]]]
Former-commit-id: e7dc89cddd
Former-commit-id: 3f434ea6e9 [formerly 05b1401849]
Former-commit-id: e4df449f49
|
2014-05-28 10:28:49 -05:00 |
|
Ron Anderson
|
1f4bde25d9
|
Omaha #3110 Permanent fix for mutable database creation.
Former-commit-id: 17da90e8db [formerly 4633de4ea3] [formerly 17da90e8db [formerly 4633de4ea3] [formerly b7271025f9 [formerly a0001c9ed3d414237069f43a29dd907111c16832]]]
Former-commit-id: b7271025f9
Former-commit-id: 3e5acbf168 [formerly f2733999de]
Former-commit-id: b6b463682f
|
2014-05-28 10:09:12 -05:00 |
|
Steve Harris
|
5fda99b1fe
|
Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java
Former-commit-id: 718c78d984 [formerly be80bd01f3] [formerly 718c78d984 [formerly be80bd01f3] [formerly dc74953978 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]
Former-commit-id: dc74953978
Former-commit-id: 0e9d0b2ef5 [formerly 713cfeffc7]
Former-commit-id: 6412cc1427
|
2014-05-28 09:01:00 -05:00 |
|
Steve Harris
|
1f24080b8e
|
Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
Former-commit-id: a4825f4b27 [formerly 2c49d14c12] [formerly a4825f4b27 [formerly 2c49d14c12] [formerly 048d3748b7 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]]
Former-commit-id: 048d3748b7
Former-commit-id: 005e5b4ee2 [formerly 4ed44b6e72]
Former-commit-id: 95462b4f80
|
2014-05-28 07:41:42 -05:00 |
|
Nate Jensen
|
caf433d525
|
Omaha #3133 Removed dead hydro code and related dependencies
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a
Former-commit-id: a984e7ac9a [formerly 514c9d3a0c] [formerly a984e7ac9a [formerly 514c9d3a0c] [formerly 67ac5fa242 [formerly 13d3dc45edab66106e9aa5a1149ca05e94d144c3]]]
Former-commit-id: 67ac5fa242
Former-commit-id: a25a8b69eb [formerly c2f78a6888]
Former-commit-id: 11899e65e2
|
2014-05-27 18:23:38 -05:00 |
|
Steve Harris
|
172cca39d9
|
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 3de24b7b07 [formerly 99bc6f990c] [formerly 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: bfa4255eea [formerly 9b98b41cd4]
Former-commit-id: 144354c369
|
2014-05-27 14:48:24 -04:00 |
|
Slav Korolev
|
bcc5a458b3
|
Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager.
Former-commit-id: adba0cd20a [formerly e3fe3c9736] [formerly adba0cd20a [formerly e3fe3c9736] [formerly 81033087ea [formerly 14ff7a84235ed8cc95aca488910e7f975a5bd41e]]]
Former-commit-id: 81033087ea
Former-commit-id: 55b01dce6d [formerly 4a8e7fc38e]
Former-commit-id: ced313a7f1
|
2014-05-27 12:24:50 -04:00 |
|
Brian Clements
|
d75008101f
|
Omaha #3206 added version to servlet api in cave feature
without this, the build prefers the javax.servlet in the target platform
Change-Id: Ic98a49f8a0dff09d0af42da1e69dd650f4fd9a80
Former-commit-id: f0e8bf76a9 [formerly 6f76a9a328] [formerly f0e8bf76a9 [formerly 6f76a9a328] [formerly 2fd2b5aa16 [formerly d0c7c0ce2bb4a7f7436a7aac1e4c87f7d5af40f2]]]
Former-commit-id: 2fd2b5aa16
Former-commit-id: 170e3644f2 [formerly af8a6806f0]
Former-commit-id: e88d9a2e8c
|
2014-05-23 17:04:49 -05:00 |
|
Nate Jensen
|
25e4982cb3
|
Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1
Former-commit-id: 730831d465 [formerly 8f6dcfaa1b] [formerly 730831d465 [formerly 8f6dcfaa1b] [formerly b67bf1e492 [formerly 34ef84d848c75826d5d8e8dd39316a6f6dcb1a4d]]]
Former-commit-id: b67bf1e492
Former-commit-id: 76a2766ed4 [formerly 935086d60e]
Former-commit-id: dcfd7a07eb
|
2014-05-22 16:46:50 -05:00 |
|
Kenneth Sperow
|
386365e3cb
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3] [formerly 476c78a2d7 [formerly 189e3cc1f2] [formerly 476c78a2d7 [formerly 189e3cc1f2] [formerly 342398e6a3 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]]]
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f
Former-commit-id: 6f8b069dbe [formerly 8490f7ea33] [formerly 6f8b069dbe [formerly 8490f7ea33] [formerly 9fa9425aea [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]]
Former-commit-id: 9fa9425aea
Former-commit-id: 7302462544 [formerly 846395fd42]
Former-commit-id: 51b0b4e566
|
2014-05-22 14:16:49 -07:00 |
|
Steve Harris
|
e30dfd21ee
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
Former-commit-id: 376482d3b1 [formerly 518822ed83] [formerly 376482d3b1 [formerly 518822ed83] [formerly b6af2db9f5 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]]
Former-commit-id: b6af2db9f5
Former-commit-id: 1dfc15a77e [formerly 14b1ea307f]
Former-commit-id: d226dfb021
|
2014-05-22 14:31:06 -05:00 |
|
Brian Clements
|
67376b444a
|
Omaha #3206 edex changes related to new javax.serlvet FOSS project
Former-commit-id: 0a2ddfbc79 [formerly f9de79465a] [formerly 0a2ddfbc79 [formerly f9de79465a] [formerly c875f17719 [formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]]]
Former-commit-id: c875f17719
Former-commit-id: 53de96dd53 [formerly fd9f98b2ba]
Former-commit-id: e7730e2219
|
2014-05-22 14:09:07 -05:00 |
|
Steve Harris
|
5aca60f422
|
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
Former-commit-id: 0a3b23d055 [formerly 4899c4f56a] [formerly 0a3b23d055 [formerly 4899c4f56a] [formerly 2059fc9c0e [formerly eae5c3e75061566e40194730c2cfb2003d952e62]]]
Former-commit-id: 2059fc9c0e
Former-commit-id: 805aae1a70 [formerly 0df4af413b]
Former-commit-id: e7e48b2abb
|
2014-05-22 14:05:06 -05:00 |
|
Ron Anderson
|
307f61e609
|
Issue #3194 Fix GeoTIFF import
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a
Former-commit-id: a8ba16fc93 [formerly 52931af5ce] [formerly a8ba16fc93 [formerly 52931af5ce] [formerly 2a680b73ea [formerly 8082b27e6e7e0a0be372abb40b62c0a0224ee49c]]]
Former-commit-id: 2a680b73ea
Former-commit-id: 8f0eb1fd10 [formerly b7338080e2]
Former-commit-id: 0d54a37b6c
|
2014-05-22 09:53:47 -05:00 |
|