Chip Gobs
|
c200d537cb
|
VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse.
Change-Id: I096cc2e9c60a5aa26662e5fccc6692c3ce4f875d
Former-commit-id: 12f78bef75 [formerly a5c4402f34] [formerly 83ac596f9e] [formerly 12f78bef75 [formerly a5c4402f34] [formerly 83ac596f9e] [formerly 036d1c4d31 [formerly 83ac596f9e [formerly 6944361d04e7462f768bb74f00780dc8b8a51225]]]]
Former-commit-id: 036d1c4d31
Former-commit-id: 1371c8a87c [formerly 8edb6c28d8] [formerly bb1f30981bdeb43668927256d57f49f733780101 [formerly 6fd88e5422]]
Former-commit-id: 2d45cc91f5762572b6eb6cac1728efefec011528 [formerly e9c140b3fc]
Former-commit-id: 5fa38e2acd
|
2014-06-05 13:37:02 -04:00 |
|
Stephen Gilbert
|
cbd603b74f
|
VLab Issue #3648 - Corrected NCEP additions for ESTOFS model
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b
Former-commit-id: bb2323b792 [formerly 11cf39ce44] [formerly b7d93ed06d] [formerly bb2323b792 [formerly 11cf39ce44] [formerly b7d93ed06d] [formerly d49482965e [formerly b7d93ed06d [formerly c681ba369a486f3ff3c7a324837a78e9c5594b4b]]]]
Former-commit-id: d49482965e
Former-commit-id: 23738d2966 [formerly 1a06e43797] [formerly 77a6bb7bb13ed1988a7199e241f15dfce9ad4d3f [formerly 9ede855df5]]
Former-commit-id: ed2c0348832631a87a4f0c08644a2ab0135f16d5 [formerly e1e95a36fe]
Former-commit-id: 7becf8d6da
|
2014-06-05 12:06:35 -04:00 |
|
Mike Duff
|
e54d8dd946
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: 3a3928cde3 [formerly 28a42f3f10] [formerly 8a5acd085d] [formerly 3a3928cde3 [formerly 28a42f3f10] [formerly 8a5acd085d] [formerly f5f101d416 [formerly 8a5acd085d [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]]]
Former-commit-id: f5f101d416
Former-commit-id: e89e9975c5 [formerly 8e6a50e2ee] [formerly 63be3054ca051657de6e1a1480a28374ac8bc854 [formerly 87d41ff302]]
Former-commit-id: 298e4a841acd8adf70326608c890a015d030d238 [formerly a615c41a57]
Former-commit-id: c2751cf532
|
2014-06-05 09:35:07 -05:00 |
|
Michael Gamazaychikov
|
b3afeb981b
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: efd0fb50b8 [formerly e5a9fa0827] [formerly c07bcacbf8] [formerly efd0fb50b8 [formerly e5a9fa0827] [formerly c07bcacbf8] [formerly 50ab77046b [formerly c07bcacbf8 [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]]
Former-commit-id: 50ab77046b
Former-commit-id: fc5acb6bcb [formerly a2423cfadc] [formerly a99f478987db9b40c18652f3f209154a8dfc3177 [formerly 5efb82ea3e]]
Former-commit-id: 177375df5384d0a8fa51c23b24915e671ade7ce1 [formerly 29e197404f]
Former-commit-id: 94595e6af4
|
2014-06-05 13:43:04 +01:00 |
|
Brian.Dyke
|
a32d416bba
|
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements...modified spec file
Former-commit-id: 67cef121bf [formerly de6a06bc8c] [formerly d708eeb7d8] [formerly 67cef121bf [formerly de6a06bc8c] [formerly d708eeb7d8] [formerly 7db87d6ccb [formerly d708eeb7d8 [formerly f671db68bfab4b9c17eb25050468e5b6306e6359]]]]
Former-commit-id: 7db87d6ccb
Former-commit-id: 60f06d1e18 [formerly c00bc1d654] [formerly 5941a66242df6eb16b8846d1f66fcfb8133681e4 [formerly bce3dc1bef]]
Former-commit-id: 00394615a5974c6470241fdef97e86ac565c48a6 [formerly c2d725a60c]
Former-commit-id: bf96a4ea21
|
2014-06-04 11:52:00 -04:00 |
|
Brian.Dyke
|
f8fec394e1
|
Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: a91c426ee7 [formerly feb26ee9b7] [formerly 61b206be0b] [formerly a91c426ee7 [formerly feb26ee9b7] [formerly 61b206be0b] [formerly 3919c9ec2f [formerly 61b206be0b [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]]]
Former-commit-id: 3919c9ec2f
Former-commit-id: 7d8dd856bd [formerly 8f6e365ece] [formerly f5c80b02fc2a80a424af9d583f9c067a6dab9c12 [formerly 244467210c]]
Former-commit-id: a57e4cdd13c530f19a214cf1874aa117dbeb8728 [formerly 75c6886f61]
Former-commit-id: cdbcdb6cbd
|
2014-06-04 07:46:16 -04:00 |
|
Brian.Dyke
|
8207d7aca9
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: cfd6da7fd4 [formerly 896aeeb2dd] [formerly 2fb1e52728] [formerly cfd6da7fd4 [formerly 896aeeb2dd] [formerly 2fb1e52728] [formerly 329393d172 [formerly 2fb1e52728 [formerly 298cc5124ee8a8b12db45ae2d2c9505f0ae99857]]]]
Former-commit-id: 329393d172
Former-commit-id: 1dbe31af34 [formerly 24cb72d0b3] [formerly 8f9bada0788cbf9b09176afa03bea90844e9518e [formerly 7ef2c8d018]]
Former-commit-id: 078a421a23363b9804bb5d0efd6575e37e952bfd [formerly f46f6c2953]
Former-commit-id: ed90689b97
|
2014-06-04 07:41:40 -04:00 |
|
Brian.Dyke
|
35ffca121b
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 942dd3ab92 [formerly 2db2536d02] [formerly 6437ee2322] [formerly 942dd3ab92 [formerly 2db2536d02] [formerly 6437ee2322] [formerly 696bf39f26 [formerly 6437ee2322 [formerly 785b4a8b95ad78d84b6e68f4d3917c7142d4a3ce]]]]
Former-commit-id: 696bf39f26
Former-commit-id: 2163462027 [formerly f8dc753d82] [formerly 651c507817908c12ac348cadd2a6bde56364233f [formerly 444630b0ba]]
Former-commit-id: 3f122e7ffd903c661176c05c7d9c691709b3bd59 [formerly de337823ba]
Former-commit-id: db5e13d110
|
2014-06-04 07:41:28 -04:00 |
|
Kenneth Sperow
|
17b05cb9d9
|
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: 764ffeb440 [formerly a59743ebe0] [formerly c302ef8967] [formerly 764ffeb440 [formerly a59743ebe0] [formerly c302ef8967] [formerly f2a738cc25 [formerly c302ef8967 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]]]
Former-commit-id: f2a738cc25
Former-commit-id: be5c7616f5 [formerly 1ba5f0a3c4] [formerly f37bc3930eb01b1551e48a86cb29ce5ebd4ca434 [formerly ca913b6159]]
Former-commit-id: c8835c1e57e17265888c244565b0ad22c4fe3c23 [formerly 3e94502542]
Former-commit-id: ca67a59e23
|
2014-06-03 20:55:29 -07:00 |
|
brian.dyke
|
2162f16b51
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 17eb7729c7 [formerly 789482b0e3] [formerly 79f866fb17] [formerly 17eb7729c7 [formerly 789482b0e3] [formerly 79f866fb17] [formerly b3d95ca18d [formerly 79f866fb17 [formerly 2d4751c000176447d28b284337fb23a60cb19cd1]]]]
Former-commit-id: b3d95ca18d
Former-commit-id: cabd43daf1 [formerly 05dfb0b2a5] [formerly 7ad9171a6cdb412defa9850b769ed5db070cb4ae [formerly 76cbdf64ff]]
Former-commit-id: b510f79b2731169c7c5a3c97d2ccf94a36652acc [formerly 21721fd935]
Former-commit-id: 65f4a41200
|
2014-06-03 16:14:16 -04:00 |
|
Zhidong.Hao
|
e842be1d53
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 43e1a5a909 [formerly ccbda4db4f] [formerly 26c6801620] [formerly 43e1a5a909 [formerly ccbda4db4f] [formerly 26c6801620] [formerly 71ab6b9ed0 [formerly 26c6801620 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]]]
Former-commit-id: 71ab6b9ed0
Former-commit-id: 460b543c6d [formerly 9094e822e0] [formerly c17aa2176430d3a612529390ab4b68f86ac03181 [formerly e5c47a51eb]]
Former-commit-id: 16d700e0af2365b3ff5388b53260c131a361d620 [formerly 3a9abec04b]
Former-commit-id: 33086a8085
|
2014-06-03 11:55:32 -04:00 |
|
Steve Harris
|
ff8f48a6b6
|
Merge branch 'master_14.3.1' (14.3.1-9) into omaha_14.3.1
Former-commit-id: c8b13897e1 [formerly 49732fbdb2] [formerly b3b768ee87] [formerly c8b13897e1 [formerly 49732fbdb2] [formerly b3b768ee87] [formerly 78fc4d83f9 [formerly b3b768ee87 [formerly 4618c3ab6ae346649438d497712e4a8ab2ae91bd]]]]
Former-commit-id: 78fc4d83f9
Former-commit-id: 97a224f142 [formerly 61758b5fda] [formerly 29972ea7f01c8304c9d73f960f5e9449973960f7 [formerly e6f5716104]]
Former-commit-id: df9f31480e655e14d29756b66bae9b9c98ac3777 [formerly 7cf41604ff]
Former-commit-id: 372e442eb4
|
2014-06-02 14:29:39 -05:00 |
|
Steve Harris
|
a22ae10591
|
Issue #2754 - added .project file to ohd/com.raytheon.uf.edex.ohd.feature/
Former-commit-id: 6cadbdb1be [formerly f4ff7a4d9c] [formerly 4c41c736b1] [formerly 6cadbdb1be [formerly f4ff7a4d9c] [formerly 4c41c736b1] [formerly 29e4453e2b [formerly 4c41c736b1 [formerly dd6245e5abd2973fd47e0cc5ca1b79470122181c]]]]
Former-commit-id: 29e4453e2b
Former-commit-id: 69b576e2f5 [formerly 8bca727f50] [formerly 0e68f41bdfb27cdfe982da59ac407a3cdfc01d29 [formerly bcaeec11a1]]
Former-commit-id: 00a65e2ea6d19ab4c1a431a2329d71f717dc72cf [formerly 2f86829213]
Former-commit-id: 4a8e870d72
|
2014-06-02 14:04:01 -05:00 |
|
Sean.Webb
|
e77eb9bc87
|
Merge "ASM #550 - Remove ITO call from monitor_qpid_hosts.sh" into asm_14.3.1
Former-commit-id: 2a11d3976c [formerly 4fb31698c4] [formerly 304678c79b] [formerly 2a11d3976c [formerly 4fb31698c4] [formerly 304678c79b] [formerly 69c5318fe7 [formerly 304678c79b [formerly 1e0452f11fbbc45406b0652c0caa3ec800bfa6f7]]]]
Former-commit-id: 69c5318fe7
Former-commit-id: a94e2d71c9 [formerly b1d640b382] [formerly 66d7e5f4e391cc5e64b8212e3af558161a5369ad [formerly 23c7b64c54]]
Former-commit-id: fc8d3447805561bef1c37af7c5d0745b452cf2ec [formerly 4c115b174d]
Former-commit-id: 1ad2deb3cc
|
2014-06-02 10:15:07 -05:00 |
|
Steve Harris
|
6fdbdfaf97
|
Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
Former-commit-id: be2931c623 [formerly 4e26e224fd] [formerly 65a3390a6a] [formerly be2931c623 [formerly 4e26e224fd] [formerly 65a3390a6a] [formerly 3bde6b3e41 [formerly 65a3390a6a [formerly ee696cb24c8d72f0562126a131824e958b88f090]]]]
Former-commit-id: 3bde6b3e41
Former-commit-id: 19f6fb968d [formerly 0edb16b05e] [formerly 674e8b1e2a9d464297f8e67d7a040e71d9e9e815 [formerly c3deafc840]]
Former-commit-id: e6ce649c9482699a06a1c902b2125fedd05ea2f0 [formerly 46b7122d56]
Former-commit-id: 9aa3a5a035
|
2014-06-02 07:31:14 -05:00 |
|
Brian.Dyke
|
a37a3d4ed5
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 4b0bf4f7af [formerly de2df4cb6f] [formerly b8ba378862] [formerly 4b0bf4f7af [formerly de2df4cb6f] [formerly b8ba378862] [formerly c6244e1950 [formerly b8ba378862 [formerly dec7b6fa091cab098b89a51551fa46b9f28b959b]]]]
Former-commit-id: c6244e1950
Former-commit-id: b7adb4f4f0 [formerly 30f72a9337] [formerly eef9582614e8cac7f605e8b40ab7d034718e2bc4 [formerly 6edbd149a5]]
Former-commit-id: de0cb68f2b7cefbbc444672a8668288909022b58 [formerly 45deec5df6]
Former-commit-id: 106a921a4c
|
2014-06-02 07:01:37 -04:00 |
|
Sean.Webb
|
d704aeb88e
|
Merge "ASM #557 - Removed rh6 dependency from wxgtk rpm requirements" into asm_14.3.1
Former-commit-id: 7b1183d283 [formerly 411b64da45] [formerly e46c62660b] [formerly 7b1183d283 [formerly 411b64da45] [formerly e46c62660b] [formerly 94f2a4ab2a [formerly e46c62660b [formerly ca4cde97f7304f94bb990dcd53ac39e06c09c7de]]]]
Former-commit-id: 94f2a4ab2a
Former-commit-id: d15ce20f37 [formerly 893598ad2f] [formerly b3245e304fc0c85c3299ae9f4c915b9c21702ea7 [formerly ae1a95e55b]]
Former-commit-id: 2aff84db40b09a7ab9abe2f6744494ded3f4afd1 [formerly c3f6e5513b]
Former-commit-id: 1db1f40b55
|
2014-05-30 14:42:34 -05:00 |
|
Sean.Webb
|
67d44b16cc
|
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements
Change-Id: I5a59edfb974c945a4d382fad109e513e3a51eeee
Former-commit-id: 0f181e50c0 [formerly ba4f3b92ce] [formerly af990fb412] [formerly 0f181e50c0 [formerly ba4f3b92ce] [formerly af990fb412] [formerly 73c2add28e [formerly af990fb412 [formerly bba964bd6af7d307a27ee85b11bce03d79f52e97]]]]
Former-commit-id: 73c2add28e
Former-commit-id: 909d36fb70 [formerly 84dd29ce87] [formerly 6601c8f842e33b252797671c20cf9d755ff2e332 [formerly 7223f7454e]]
Former-commit-id: d34bc13889533d0f1647d4a25c03acd631f9e9f8 [formerly 7b3b92913d]
Former-commit-id: fa531fa4b1
|
2014-05-30 14:40:44 -04:00 |
|
Sean.Webb
|
eaf0a3cecf
|
ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03
Former-commit-id: 8241b1904d [formerly d899f42637] [formerly c05e8e319e] [formerly 8241b1904d [formerly d899f42637] [formerly c05e8e319e] [formerly 75f8e82eeb [formerly c05e8e319e [formerly 88147ed5e5cd84e40acf61ad46d1baa554fd4e28]]]]
Former-commit-id: 75f8e82eeb
Former-commit-id: 3bc3e3a61f [formerly a6a5887fe8] [formerly 69c2ae20cae2240566ece68108ae8a55e64b93db [formerly 43bf2d622f]]
Former-commit-id: c43b5f5ccfa9cddc70bd6d9fbbb3d773442f52ca [formerly 6677a8db47]
Former-commit-id: d9abb4bf75
|
2014-05-30 14:27:59 -04:00 |
|
Sean.Webb
|
954782c9a6
|
ASM #550 - Remove ITO call from monitor_qpid_hosts.sh
Change-Id: I685b7ea1f2ed6d1eeb91e933b76eee051a3332f8
Former-commit-id: 47f00bd288 [formerly fe087a93cb] [formerly 3fff8c6164] [formerly 47f00bd288 [formerly fe087a93cb] [formerly 3fff8c6164] [formerly 42b78d7ec0 [formerly 3fff8c6164 [formerly 43c50503e9aadc3dc66cdbf6b50f18a642547f35]]]]
Former-commit-id: 42b78d7ec0
Former-commit-id: 00173bf315 [formerly 5a7c0a1805] [formerly 8322ad900f8433df5342e664d7d273cc89f51d55 [formerly 542f05aa9a]]
Former-commit-id: 77d89d5142a7d202178d990ddd7860c159402890 [formerly 84bfcb364c]
Former-commit-id: a3403f9dc9
|
2014-05-30 14:09:16 -04:00 |
|
Brian.Dyke
|
408ecfa5c0
|
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: 5524d6b38d [formerly a0a879be7d] [formerly a8737e18f0] [formerly 5524d6b38d [formerly a0a879be7d] [formerly a8737e18f0] [formerly 3f1e12effc [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]]
Former-commit-id: 3f1e12effc
Former-commit-id: c76d6df69d [formerly 3961c75ecd] [formerly 8ed2dc55683cd373c693766e728d2dbc5c2f9e63 [formerly 66aacd6578]]
Former-commit-id: 48941da01de7ecd361d967e7d76a018c85a27337 [formerly a23d371522]
Former-commit-id: 9351315fd6
|
2014-05-30 10:46:25 -04:00 |
|
brian.dyke
|
0511ff697f
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: f9cf99e369 [formerly 2c2bb61e95] [formerly 95c5dc49c1] [formerly f9cf99e369 [formerly 2c2bb61e95] [formerly 95c5dc49c1] [formerly 03cc2fbbfb [formerly 95c5dc49c1 [formerly 2e170e3e328804a56f65de7cec0f0e89d3f1aba4]]]]
Former-commit-id: 03cc2fbbfb
Former-commit-id: 0cbd37db4f [formerly b6623af1f7] [formerly 3bc9505e32a1d8fc6fd49b2e6e13c333e4573bb6 [formerly e09bd1d283]]
Former-commit-id: 2f8e75b3b74d8ab1aa705815c003473f38cbc788 [formerly 3f9ac5ba24]
Former-commit-id: 45dd00f016
|
2014-05-30 10:09:00 -04:00 |
|
brian.dyke
|
37b3baed83
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: e1f9c919e6 [formerly 2f53c2e385] [formerly 7dde6e1d04] [formerly e1f9c919e6 [formerly 2f53c2e385] [formerly 7dde6e1d04] [formerly ee7c67f7b0 [formerly 7dde6e1d04 [formerly d7b707236a1ee3bca45dee26c10814d9e3c275c8]]]]
Former-commit-id: ee7c67f7b0
Former-commit-id: b2b232c2cc [formerly 8b93c973d6] [formerly 5b345e8fad1dba7b952e789980e9a6f6873f05eb [formerly cf49a7217f]]
Former-commit-id: 1c3c352f258fa1fe750be56c373b425249190beb [formerly 05f691d0cd]
Former-commit-id: a5b2f384bf
|
2014-05-30 10:07:12 -04:00 |
|
Matthew Howard
|
904a3b24f7
|
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: d0880003a6 [formerly 099185c960] [formerly 781d0331ab] [formerly d0880003a6 [formerly 099185c960] [formerly 781d0331ab] [formerly 8375a2af3e [formerly 781d0331ab [formerly def2351f527613dd62a081161e5f3a87756493ec]]]]
Former-commit-id: 8375a2af3e
Former-commit-id: b7f3c5798e [formerly 11216ced25] [formerly d46f8a355df86411c1f5283003df72a741dbec12 [formerly f68748bd63]]
Former-commit-id: 46ac2ea21d50d92b8371c417dd9b8efffd8f82a9 [formerly 04c0631701]
Former-commit-id: db35baefc8
|
2014-05-29 15:54:37 -05:00 |
|
Shawn.Hooper
|
8fe8f54975
|
ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 4de35d0a2b [formerly 08ad9a66cc] [formerly fe567b2a5b] [formerly 4de35d0a2b [formerly 08ad9a66cc] [formerly fe567b2a5b] [formerly 5cf0579d20 [formerly fe567b2a5b [formerly 626ee991cd7e9dbfe52342abd9e3fd41b973f72a]]]]
Former-commit-id: 5cf0579d20
Former-commit-id: 94ec109216 [formerly 0fe034cc8b] [formerly 1363ea6a68426295d8f737eab6b4aff6d84a7400 [formerly 2c476e2bb4]]
Former-commit-id: 5db8829a63e68c0d2815ce3a3cb52cffe50787a0 [formerly 3cb14aecd9]
Former-commit-id: a4de244bdb
|
2014-05-29 16:56:46 -04:00 |
|
Steve Harris
|
265c5e4811
|
Merge branch 'master_14.2.2' (14.2.2-9,10,11) into omaha_14.2.2
Former-commit-id: 74b0099fdf [formerly 53645445fe] [formerly c7ef7878f5] [formerly 74b0099fdf [formerly 53645445fe] [formerly c7ef7878f5] [formerly 9313e045bf [formerly c7ef7878f5 [formerly 03b376033b3374694bc8a6e0a2c55b830db058e1]]]]
Former-commit-id: 9313e045bf
Former-commit-id: 774a5c516c [formerly 947d44c945] [formerly 67033e82aff16def433329064a8788daafb7920f [formerly e92b927c5a]]
Former-commit-id: 75fff8fc4c85753165134554cdcdbacca2a82acc [formerly ba06fa79f9]
Former-commit-id: 0571a7877b
|
2014-05-29 07:45:24 -05:00 |
|
Brian.Dyke
|
9784438847
|
Merge remote-tracking branch 'remotes/origin/master_14.2.1' into master_14.2.2 CM-MERGE:14.2.1-30 into 14.2.2
Former-commit-id: 9e0cf9b945 [formerly 47a37b112a] [formerly b7ef9420e1] [formerly 9e0cf9b945 [formerly 47a37b112a] [formerly b7ef9420e1] [formerly 574246b6d4 [formerly b7ef9420e1 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]]]
Former-commit-id: 574246b6d4
Former-commit-id: 7d8cb95e95 [formerly 45d59380ea] [formerly 8dc10058004612f82f3168b336f93c36d1945933 [formerly 2c1fabb0f8]]
Former-commit-id: c03dd203d258e405f3ff9771fe66b95d7dbeaaea [formerly 551def9f1a]
Former-commit-id: 1bae94a61a
|
2014-05-28 16:25:33 -04:00 |
|
Shawn Hooper
|
c0198671d8
|
Merge "ASM #600 - the fixes for DR 17380" into asm_14.3.1
Former-commit-id: a44c634ce8 [formerly 1f036b4573] [formerly 422473b8a0] [formerly a44c634ce8 [formerly 1f036b4573] [formerly 422473b8a0] [formerly 87d98c31fb [formerly 422473b8a0 [formerly 25235d87722f50f4bd034002f2b9d7f1f9dfcd42]]]]
Former-commit-id: 87d98c31fb
Former-commit-id: 345d5462fc [formerly 82fd8d413d] [formerly f7dbff504b6ddd0193042aca189a29ba09a5cefa [formerly 7def8a109d]]
Former-commit-id: 95b5d4b79f3fcdf048e1daf75f718f08fb8e2d1d [formerly c75cda44b3]
Former-commit-id: bc0d8972ed
|
2014-05-28 13:04:45 -05:00 |
|
Brian.Dyke
|
ee83737427
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: 0fe87c550c [formerly 6f64664e70] [formerly 4c010cf27a] [formerly 0fe87c550c [formerly 6f64664e70] [formerly 4c010cf27a] [formerly ce81b44f32 [formerly 4c010cf27a [formerly b92ce0c1589c48de73387c142f1302409a3b0cb7]]]]
Former-commit-id: ce81b44f32
Former-commit-id: 90a397bd7e [formerly 4f434e1bf9] [formerly 1509b1f949c311ae098b3a9a2397fccd0508dc1c [formerly 73ec45c5b2]]
Former-commit-id: d276945aa3a9c7c155010ce4bc7455ff38448cbc [formerly f5bc17ef24]
Former-commit-id: 992186e641
|
2014-05-28 09:36:15 -04:00 |
|
Steve Harris
|
6281b0148d
|
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: 835486c63f [formerly a4825f4b27] [formerly 2c49d14c12] [formerly 835486c63f [formerly a4825f4b27] [formerly 2c49d14c12] [formerly 048d3748b7 [formerly 2c49d14c12 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]]]
Former-commit-id: 048d3748b7
Former-commit-id: 5469a5e863 [formerly 005e5b4ee2] [formerly 07a1965ea47f8ad30b0325329a0a7da148a19824 [formerly 4ed44b6e72]]
Former-commit-id: 84d3011f8d7a6ba7981aad3e8439f3e517ebf403 [formerly 95462b4f80]
Former-commit-id: 1f24080b8e
|
2014-05-28 07:41:42 -05:00 |
|
Brian.Dyke
|
05c094d6f9
|
CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: fba5604613 [formerly 089b2559bb] [formerly e95ee60224] [formerly fba5604613 [formerly 089b2559bb] [formerly e95ee60224] [formerly e852623f48 [formerly e95ee60224 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]]]]
Former-commit-id: e852623f48
Former-commit-id: 4400514725 [formerly f07b83ce91] [formerly e2442f94c9c8f1691bd70abcf54b5b626473d3de [formerly b745ac5926]]
Former-commit-id: 81d8abdb8531e95eb3a0bcb835f669e7a5037729 [formerly 21112face5]
Former-commit-id: befec4cf01
|
2014-05-28 08:40:56 -04:00 |
|
Fay.Liang
|
294e428e0d
|
ASM #600 - the fixes for DR 17380
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a
Former-commit-id: 9bc5268f64 [formerly d57ebaad64] [formerly 0b9a011c58] [formerly 9bc5268f64 [formerly d57ebaad64] [formerly 0b9a011c58] [formerly f56d9511b8 [formerly 0b9a011c58 [formerly 445239c00cbe2147c014e180570085be6224da79]]]]
Former-commit-id: f56d9511b8
Former-commit-id: f89c9c34a8 [formerly 1411895d5d] [formerly 5f5885d7e2755ddd8b853891b3bd33394ac85b10 [formerly b77277b80e]]
Former-commit-id: 686f035ee54396179299e3a373b9a7bb09614269 [formerly 247f3817be]
Former-commit-id: b1f0d4db14
|
2014-05-27 16:04:22 -04:00 |
|
David Friedman
|
fd91bd6a45
|
Merge "ASM #512 - Need radar data watchdog functionality" into asm_14.3.1
Former-commit-id: 4399b2a09d [formerly 2566b64668] [formerly a57e547697] [formerly 4399b2a09d [formerly 2566b64668] [formerly a57e547697] [formerly 602150ea73 [formerly a57e547697 [formerly 9de711dfd85512d7bbdee2c91132d5250373c676]]]]
Former-commit-id: 602150ea73
Former-commit-id: 15e8f07b95 [formerly 8e0ec97eff] [formerly a1e9325c66998706deb4b9732b27b9de30e8a65c [formerly c7eb18fc66]]
Former-commit-id: 6cb82f9d3e8e4ffa449efcb64a50ac0918eaa235 [formerly 0c84a74214]
Former-commit-id: 9240b52ae4
|
2014-05-27 15:03:48 -05:00 |
|
Daniel.Huffman
|
9f807e53d4
|
ASM #512 - Need radar data watchdog functionality
Change-Id: I54bb10185d5940d27417d1d40e21310ed5aeb8e3
Former-commit-id: 5019e2d171 [formerly 343046c159] [formerly eab2733238] [formerly 5019e2d171 [formerly 343046c159] [formerly eab2733238] [formerly 8326f42ed8 [formerly eab2733238 [formerly b3f33a3c49607219a234bede34bd983178151f39]]]]
Former-commit-id: 8326f42ed8
Former-commit-id: f1d7154915 [formerly 1bd20432a3] [formerly 4cfe1fd8c4dca6cc4a10913b48925c9c91e851e2 [formerly b63c845a2b]]
Former-commit-id: 1fbadfd2f874be9a3dab9e49e668e0d863835bb6 [formerly 0503a4f11d]
Former-commit-id: 4fc007a417
|
2014-05-27 19:59:53 +00:00 |
|
Steve Harris
|
cf2950abdb
|
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: 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648 [formerly bfa4255eea] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369]
Former-commit-id: 172cca39d9
|
2014-05-27 14:48:24 -04:00 |
|
Brian.Dyke
|
9339e1d334
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1
Former-commit-id: f3b0bdff29 [formerly ea618935d0] [formerly 575cebda84] [formerly f3b0bdff29 [formerly ea618935d0] [formerly 575cebda84] [formerly 638acc2c06 [formerly 575cebda84 [formerly 34c582add16be1620f400d78d2f37da8c534f71a]]]]
Former-commit-id: 638acc2c06
Former-commit-id: f30eefeda4 [formerly 2ab1fc6ddf] [formerly 05ba75929061ec2ce7acb3c93b8c5d42ef107834 [formerly 290b85b556]]
Former-commit-id: 7fc30cfb987148987dd92b3d01e3a3049445c44c [formerly 09f2d8b8b1]
Former-commit-id: d078a2630e
|
2014-05-27 13:42:09 -04:00 |
|
Brian.Dyke
|
d3a6a77351
|
CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: 86eefc2026 [formerly 4a1b6d70c4] [formerly 89a8caddbb] [formerly 86eefc2026 [formerly 4a1b6d70c4] [formerly 89a8caddbb] [formerly ba8d7dbbb7 [formerly 89a8caddbb [formerly d57f7989982a59a546116b63a406294573844039]]]]
Former-commit-id: ba8d7dbbb7
Former-commit-id: 90cf8cd426 [formerly bb5d88be66] [formerly ddbd59370c87b39e43f9f08800b6f899c79a9f83 [formerly ebdd53742c]]
Former-commit-id: 396b767d5da65f7b066a5f0b100e2c3770df5813 [formerly 1a69aaf89a]
Former-commit-id: 7e5475923c
|
2014-05-27 13:30:35 -04:00 |
|
Fay.Liang
|
09bf017894
|
ASM #596 - Watch wording not properly inserted into some warning products
Change-Id: I7dc223d95f06a6a259e969cfbb8e4bde2f4b9192
Former-commit-id: 61c177c7b2 [formerly 17f1404221] [formerly c007420e22] [formerly 61c177c7b2 [formerly 17f1404221] [formerly c007420e22] [formerly 4fa60f159a [formerly c007420e22 [formerly ed8cd169fe0a531d0d83411f7b1afe787088d406]]]]
Former-commit-id: 4fa60f159a
Former-commit-id: 5e77392ab7 [formerly 3ed3e2249d] [formerly 8d8e3635fce79ec738b4c75ee9ff6d33751dd44e [formerly 5d763a0f3d]]
Former-commit-id: 144705b862a68adbc7f6bb69846df6926ebe33de [formerly 605c976986]
Former-commit-id: 2ac429bff7
|
2014-05-23 15:47:50 -04:00 |
|
Steve Harris
|
2a88a04eec
|
Merge branch 'master_14.3.1' (14.3.1-6) into omaha_14.3.1
Former-commit-id: e8e7e88400 [formerly 31711d4c5a] [formerly 7dc84f4c74] [formerly e8e7e88400 [formerly 31711d4c5a] [formerly 7dc84f4c74] [formerly b059918699 [formerly 7dc84f4c74 [formerly 36b00a413b977ef5e11a46cf6f3d575e39ee4b57]]]]
Former-commit-id: b059918699
Former-commit-id: 095766ccbd [formerly 16e2265208] [formerly 5916017749edd5f39f4ef4e7a818228812da8b3d [formerly 440d6b16cf]]
Former-commit-id: 4f83504df3b4aa1972a77d9b65567c9473bba2d1 [formerly af2f9d8a72]
Former-commit-id: d3a614b5d8
|
2014-05-23 08:09:39 -05:00 |
|
brian.dyke
|
23dca67667
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: e306112841 [formerly cfa4b886f9] [formerly 53de0233a4] [formerly e306112841 [formerly cfa4b886f9] [formerly 53de0233a4] [formerly 1976d2e1fd [formerly 53de0233a4 [formerly 861a76d237eb18effd3bc52731875b10b84389d4]]]]
Former-commit-id: 1976d2e1fd
Former-commit-id: bd406c3ec8 [formerly 03cfa48b9e] [formerly 382afbbd51992ebb448356a801a37947d16b0b36 [formerly 4d7c60dbc5]]
Former-commit-id: 7d5890d8443518dbbd9945da3a2c5b84639c817b [formerly 07192fa176]
Former-commit-id: 75170fef57
|
2014-05-23 08:58:39 -04:00 |
|
Kenneth Sperow
|
bb365b1879
|
Merge remote branch 'origin/master_14.3.1' into mdl_14.3.1
Former-commit-id: 79f11bb114 [formerly 3a1925bf06] [formerly 07881695e9] [formerly 79f11bb114 [formerly 3a1925bf06] [formerly 07881695e9] [formerly dae982a2be [formerly 07881695e9 [formerly ae21d53409ab3c839774f8621d706f1bea5456de]]]]
Former-commit-id: dae982a2be
Former-commit-id: 1812c5e41d [formerly 3b1b46f0f9] [formerly b6f3f52d0c2835138340e63f2a4bdd4fa6b479d6 [formerly 44bbe7733e]]
Former-commit-id: a8ae03fca130c6956419c11a5b88a437ab0d5698 [formerly fd53b08211]
Former-commit-id: 2eccad65df
|
2014-05-22 14:58:37 -07:00 |
|
Kenneth Sperow
|
1b837bed5d
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3] [formerly 30173aa114 [formerly 476c78a2d7] [formerly 189e3cc1f2] [formerly 30173aa114 [formerly 476c78a2d7] [formerly 189e3cc1f2] [formerly 342398e6a3 [formerly 189e3cc1f2 [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: 5e3a370777 [formerly 6f8b069dbe] [formerly 8490f7ea33] [formerly 5e3a370777 [formerly 6f8b069dbe] [formerly 8490f7ea33] [formerly 9fa9425aea [formerly 8490f7ea33 [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]]]
Former-commit-id: 9fa9425aea
Former-commit-id: 186b8987ed [formerly 7302462544] [formerly 32e40a5886b016193ab4c39a18d36a93d1143fdb [formerly 846395fd42]]
Former-commit-id: bd2d790b3e0fdcecb8c3759c0035a981ed6db7b1 [formerly 51b0b4e566]
Former-commit-id: 386365e3cb
|
2014-05-22 14:16:49 -07:00 |
|
Steve Harris
|
2118803e86
|
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
Former-commit-id: 74c5b0454c [formerly 0a3b23d055] [formerly 4899c4f56a] [formerly 74c5b0454c [formerly 0a3b23d055] [formerly 4899c4f56a] [formerly 2059fc9c0e [formerly 4899c4f56a [formerly eae5c3e75061566e40194730c2cfb2003d952e62]]]]
Former-commit-id: 2059fc9c0e
Former-commit-id: aa266f6ded [formerly 805aae1a70] [formerly 075083683c45c73e61f607291d9d32a3cc865f27 [formerly 0df4af413b]]
Former-commit-id: ef4132ffa26246b1912b6d1234a3a9d9d473e8aa [formerly e7e48b2abb]
Former-commit-id: 5aca60f422
|
2014-05-22 14:05:06 -05:00 |
|
Steve Harris
|
a2ee4d0706
|
Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
Former-commit-id: 7b9e17582c [formerly 1e34c7eda3] [formerly 3ed42be350] [formerly 7b9e17582c [formerly 1e34c7eda3] [formerly 3ed42be350] [formerly acecfd7dfa [formerly 3ed42be350 [formerly a125cbc03cc5cace25e35b3516c34f9d7060a78e]]]]
Former-commit-id: acecfd7dfa
Former-commit-id: 90b1631c3a [formerly efafb08e74] [formerly 6822edbc09ceb4a447389a31731027b78a6cf212 [formerly fdaf7083f5]]
Former-commit-id: 8aa2bc42dd952237933e1dcd297ff41e18568556 [formerly 8b68aea03b]
Former-commit-id: 4a2ed02d2c
|
2014-05-22 13:52:02 -05:00 |
|
Stephen Gilbert
|
bd63e7e0fa
|
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
Removed dependency on persistCamelRegistered from ncgrib spring config
Change-Id: I84e7b6fc6e50f9d1795e887a9fb30f9cdda3a7f8
Former-commit-id: 7c9b12df92 [formerly 0dff405bc4] [formerly 3b8233dd88] [formerly 7c9b12df92 [formerly 0dff405bc4] [formerly 3b8233dd88] [formerly 4299e7c72c [formerly 3b8233dd88 [formerly a7140f38a54a577dd2d62cc551ab182b561f6fc0]]]]
Former-commit-id: 4299e7c72c
Former-commit-id: 74a20de032 [formerly 2c50057a68] [formerly 6dd3b816588c54d34cfd6e71c534f7bbcce8fe6c [formerly e07ae7a2f2]]
Former-commit-id: b3cf0fc0cd1837a7116553b9024424a57efc5968 [formerly e7f7a9be50]
Former-commit-id: 06d85fccc6
|
2014-05-22 14:35:49 -04:00 |
|
Stephen Gilbert
|
24813f746a
|
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 834c0bf1bb [formerly 651f6a2e9c] [formerly 8a3ab16e46] [formerly 834c0bf1bb [formerly 651f6a2e9c] [formerly 8a3ab16e46] [formerly e73836f3b5 [formerly 8a3ab16e46 [formerly d2d54ee2bfbbe6fef44df58d2edc3b5858ffbe22]]]]
Former-commit-id: e73836f3b5
Former-commit-id: 91a38fa974 [formerly 71730ae2ec] [formerly 6e14f279809646ca0e0b18ef76e9476cce9625f2 [formerly 571cc69cf3]]
Former-commit-id: a7cc4292e917e0d145858436d8800333346531ae [formerly 98c83bf2d8]
Former-commit-id: e2f79fb8a8
|
2014-05-22 13:31:12 -04:00 |
|
brian.dyke
|
baa0b53942
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: ed62e77a57 [formerly f405e8c89c] [formerly 562f53874a] [formerly ed62e77a57 [formerly f405e8c89c] [formerly 562f53874a] [formerly f74b1707f9 [formerly 562f53874a [formerly 59ff65f9d31cef6549ea8912adceb9ed4c7d11f6]]]]
Former-commit-id: f74b1707f9
Former-commit-id: a4ade097f7 [formerly ab985767bd] [formerly 3a90970de36c174b3d02e2cc523d82dcac4a7768 [formerly 69a4d1e3b9]]
Former-commit-id: 72a2e2d8091afbd8fc3249fa01ea9e8ae03904a5 [formerly 40660547cf]
Former-commit-id: 974b796441
|
2014-05-22 12:46:56 -04:00 |
|
Stephen Gilbert
|
452bfa9d84
|
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
Change-Id: Id609c4bd0e120f357b15c8a859ec0ece54ed47e0
Former-commit-id: 94a1a64ef0 [formerly 14258764bd] [formerly 91d469eb90] [formerly 94a1a64ef0 [formerly 14258764bd] [formerly 91d469eb90] [formerly 7992a6b15b [formerly 91d469eb90 [formerly 42eab5bcfeae6a2e1db32b83a68249bb37c9584e]]]]
Former-commit-id: 7992a6b15b
Former-commit-id: 4297d1f4a1 [formerly 86953e803e] [formerly 7d9adad19d0ed205e605a53d17ac72dfe7e55e8a [formerly 7aaf3f44bc]]
Former-commit-id: 93a80fa925256b902175fdfdcd66bdd73bab30f9 [formerly adf872f445]
Former-commit-id: fc4715cc46
|
2014-05-22 12:39:09 -04:00 |
|
Roger Ferrel
|
5dc637b676
|
Issue #3181 Add check for valid array index.
Change-Id: I8e0a37bdd094b341da2ce42922a16d840d1ab468
Former-commit-id: 466bfed41e [formerly fb4ac9acc7] [formerly a1f25b8748] [formerly 466bfed41e [formerly fb4ac9acc7] [formerly a1f25b8748] [formerly adf6d95c01 [formerly a1f25b8748 [formerly ca01934f9e9d355dd4159fd472e2aa9bc0918898]]]]
Former-commit-id: adf6d95c01
Former-commit-id: 9df0147324 [formerly f719199e17] [formerly 6721cfdb37bf2845087f90f2e6251587f1d3a567 [formerly 060d9e5003]]
Former-commit-id: a3f9e1b1978ecb8281764b0c480f4c0ef4e1ab27 [formerly b923a09ded]
Former-commit-id: 21e303627a
|
2014-05-22 11:20:26 -05:00 |
|
Ron Anderson
|
b5414458d7
|
Issue #3194 Fix GeoTIFF import
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a
Former-commit-id: 4c33bf1b30 [formerly a8ba16fc93] [formerly 52931af5ce] [formerly 4c33bf1b30 [formerly a8ba16fc93] [formerly 52931af5ce] [formerly 2a680b73ea [formerly 52931af5ce [formerly 8082b27e6e7e0a0be372abb40b62c0a0224ee49c]]]]
Former-commit-id: 2a680b73ea
Former-commit-id: 53f238a71a [formerly 8f0eb1fd10] [formerly 5bf8e1cb7607244d1101bece3a1e3dcc74e4a9a5 [formerly b7338080e2]]
Former-commit-id: 1b8f4a976ac80b88790a121b1754564820afd7a6 [formerly 0d54a37b6c]
Former-commit-id: 307f61e609
|
2014-05-22 09:53:47 -05:00 |
|