Steve Harris
|
718e97e5a3
|
Merge branch 'master_14.2.2' (14.2.2-5) into omaha_14.2.2
Former-commit-id: 82afa73cc2 [formerly 0d474430cc] [formerly 82afa73cc2 [formerly 0d474430cc] [formerly 5742ac326a [formerly 6fad1517d1bc35108d09af988d7a94cdc3f0f822]]]
Former-commit-id: 5742ac326a
Former-commit-id: aba6a54946 [formerly 937bd9d052]
Former-commit-id: d0897b9409
|
2014-04-25 12:12:10 -05:00 |
|
Shawn.Hooper
|
b8a3b168d2
|
ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml
Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930
Former-commit-id: 9182d8428a [formerly a3e52e8cea] [formerly 9182d8428a [formerly a3e52e8cea] [formerly b4597dc021 [formerly 968a136e81b6247a03af9b78643c388d21a4218b]]]
Former-commit-id: b4597dc021
Former-commit-id: 1e4aeb5842 [formerly eeaba5539f]
Former-commit-id: 947b31eb6e
|
2014-04-25 10:40:43 -04:00 |
|
Shawn.Hooper
|
bfee40353b
|
ASM #224 - WarnGen: OB13.5.2 Template Errors
Change-Id: I99339c0ea3d0110ca855dd3db82b41b28a32dd6d
Former-commit-id: 8ffe88d856 [formerly 09204a381c] [formerly 8ffe88d856 [formerly 09204a381c] [formerly 79db962a88 [formerly c6fffaf265dc184b7692a43bb461572f54b8190a]]]
Former-commit-id: 79db962a88
Former-commit-id: 896fe0691e [formerly c49eee4928]
Former-commit-id: ceb1c711ea
|
2014-04-25 10:19:48 -04:00 |
|
Steve Harris
|
a8a16c5c27
|
Merge branch 'master_14.2.1' (14.2.1-19,20) into omaha_14.2.1
Change-Id: Ib48a2c15e266cd012aba975c25ef094b828a0f68
Former-commit-id: 066515b7c5 [formerly 4f9620bb04] [formerly 066515b7c5 [formerly 4f9620bb04] [formerly 18e79fe08d [formerly 749922901de5a57c7344f29def844a5ecf90304a]]]
Former-commit-id: 18e79fe08d
Former-commit-id: 0a58f699aa [formerly 22d24534e4]
Former-commit-id: 26475d2081
|
2014-04-25 09:09:38 -05:00 |
|
Brian.Dyke
|
d6e931dd87
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: a5c9321a8d [formerly a61af3e6d3] [formerly a5c9321a8d [formerly a61af3e6d3] [formerly ac74878ae2 [formerly 48184880ce65a4899a4ed989f2d3f8082771047f]]]
Former-commit-id: ac74878ae2
Former-commit-id: ae4aea9abf [formerly c21644c87f]
Former-commit-id: b3a733036c
|
2014-04-24 13:28:31 -04:00 |
|
Brian.Dyke
|
378332d8bb
|
Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: eff27f5504 [formerly a19f01c620] [formerly eff27f5504 [formerly a19f01c620] [formerly e82fc8f89c [formerly 4e921dbeab89e61635144b441ae0015155376c59]]]
Former-commit-id: e82fc8f89c
Former-commit-id: af2d8f5bad [formerly df6f06bef5]
Former-commit-id: 0fa669acce
|
2014-04-24 13:01:50 -04:00 |
|
Brian.Dyke
|
2161c569ea
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 88d44a3129 [formerly 2a4fe3dbae] [formerly 88d44a3129 [formerly 2a4fe3dbae] [formerly a7c9ddc05e [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: 953236aad8 [formerly 911c0c6c17]
Former-commit-id: 26cb172a04
|
2014-04-23 14:05:50 -04:00 |
|
Ron Anderson
|
0c7c52095e
|
Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052
Former-commit-id: db978fff9a [formerly b12a6cd828] [formerly db978fff9a [formerly b12a6cd828] [formerly 859d709a03 [formerly 6f141288cae462aac8c1ea8c77dd7f88a33c382a]]]
Former-commit-id: 859d709a03
Former-commit-id: 57e277dc69 [formerly e8a07a2ebe]
Former-commit-id: 51bb78561c
|
2014-04-22 14:38:54 -05:00 |
|
Zhidong.Hao
|
914803ff7a
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303
Former-commit-id: f16936223a [formerly e1d5aa284d] [formerly f16936223a [formerly e1d5aa284d] [formerly 0177756f97 [formerly 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4]]]
Former-commit-id: 0177756f97
Former-commit-id: d6edd56d34 [formerly 358e7b2b54]
Former-commit-id: 7d00166b10
|
2014-04-22 14:31:14 -04:00 |
|
Dave Hladky
|
4ce5dfcd92
|
Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 91bd735d47 [formerly 61fc2fea51] [formerly 91bd735d47 [formerly 61fc2fea51] [formerly 45059e722a [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]
Former-commit-id: 45059e722a
Former-commit-id: 117a3953af [formerly ae84d2991e]
Former-commit-id: 6c83fd0929
|
2014-04-21 12:26:47 -05:00 |
|
Richard Peter
|
8768811fde
|
Merge "Issue #3011 Fixed slot cleanup" into omaha_14.2.1
Former-commit-id: dc41da4a65 [formerly 9dc957f1a1] [formerly dc41da4a65 [formerly 9dc957f1a1] [formerly 1e33125cb7 [formerly 8b8523aa60fa649a3208a5f3ae7dcb1fded3f0e6]]]
Former-commit-id: 1e33125cb7
Former-commit-id: 5dd87d4b5d [formerly 4e71d9e099]
Former-commit-id: 68df58fb03
|
2014-04-18 15:15:13 -05:00 |
|
Benjamin Phillippe
|
160f48406a
|
Issue #3011 Fixed slot cleanup
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5
Former-commit-id: b0d162ccba [formerly b2686e46cf] [formerly b0d162ccba [formerly b2686e46cf] [formerly b86fae838f [formerly 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983]]]
Former-commit-id: b86fae838f
Former-commit-id: 1d600c8559 [formerly d8408a9b3f]
Former-commit-id: 201f25eab3
|
2014-04-18 15:10:46 -05:00 |
|
Steve Harris
|
7a7033d0a1
|
Merge branch 'master_14.2.2' (14.2.2-4) into omaha_14.2.2
Former-commit-id: 159b520938 [formerly 06cf9aa40f] [formerly 159b520938 [formerly 06cf9aa40f] [formerly 5b9cbd8ce4 [formerly 26e51b0d60276597388fb3ad49fed4dddaa8a2ca]]]
Former-commit-id: 5b9cbd8ce4
Former-commit-id: c855b11132 [formerly 861a04a77a]
Former-commit-id: 01ff56473c
|
2014-04-18 14:38:54 -05:00 |
|
Brian.Dyke
|
ddee08368a
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 3b90abdf7a [formerly 880329e4ae] [formerly 3b90abdf7a [formerly 880329e4ae] [formerly 9943a331c3 [formerly d07d06f5e4b3c1dbf7d165ad97b9b114a4819011]]]
Former-commit-id: 9943a331c3
Former-commit-id: 2c8e6ec2fc [formerly 62c2a8b843]
Former-commit-id: 989b873f6e
|
2014-04-18 07:53:10 -04:00 |
|
Brian.Dyke
|
8275f3907f
|
Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
Former-commit-id: 53ce26a9b6 [formerly 1aec3b3698] [formerly 53ce26a9b6 [formerly 1aec3b3698] [formerly 645fe64a4a [formerly 178acb792036869e903beea636c7216e1d3a4f58]]]
Former-commit-id: 645fe64a4a
Former-commit-id: 66974e17b9 [formerly 4eb3317f80]
Former-commit-id: 59cbfdf093
|
2014-04-17 14:42:44 -04:00 |
|
Brian.Dyke
|
de500c093f
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 9df6fb2d4d [formerly 12a482e1d7] [formerly 9df6fb2d4d [formerly 12a482e1d7] [formerly b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: b8829139a2
Former-commit-id: 6f35818917 [formerly 0ea7c51ad7]
Former-commit-id: a925ba6219
|
2014-04-17 14:42:35 -04:00 |
|
Nate Jensen
|
f607630d72
|
Issue #3018 addressing code review comments
Former-commit-id: 54951100af [formerly e327f5e0bf] [formerly 54951100af [formerly e327f5e0bf] [formerly 8ba6b2722d [formerly 85d9dd0158ab873e1e9b76805853c712bb0c7c2c]]]
Former-commit-id: 8ba6b2722d
Former-commit-id: 81f8f6f328 [formerly 8b6650c898]
Former-commit-id: 3737ad85b6
|
2014-04-17 09:28:47 -05:00 |
|
Ron Anderson
|
d704f90445
|
Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
Former-commit-id: 85a1f55ea0 [formerly f9a393172f] [formerly 85a1f55ea0 [formerly f9a393172f] [formerly 1ba72371be [formerly 6813b32786289503950322c02e32803299566c5d]]]
Former-commit-id: 1ba72371be
Former-commit-id: 2139c2308e [formerly 7d09397faa]
Former-commit-id: 94f852cda7
|
2014-04-16 18:02:11 -05:00 |
|
Nate Jensen
|
de32624fdf
|
Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
Former-commit-id: 781ec3ecd6 [formerly a085b71c81] [formerly 781ec3ecd6 [formerly a085b71c81] [formerly c362af04f3 [formerly 7384a2d32ef554362a0693038e9b60a589afb86a]]]
Former-commit-id: c362af04f3
Former-commit-id: 1a40bc4824 [formerly e1caa66625]
Former-commit-id: e4aeb8394d
|
2014-04-16 17:25:09 -05:00 |
|
Nate Jensen
|
64e7ac4225
|
Issue #3039 fix ifpImage class cast exception
Former-commit-id: a5edace073 [formerly 2b6db445c0] [formerly a5edace073 [formerly 2b6db445c0] [formerly 31fb61e824 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]
Former-commit-id: 31fb61e824
Former-commit-id: 19f0be6afc [formerly a1dd7f24fa]
Former-commit-id: 7e7bbfd784
|
2014-04-16 16:17:05 -05:00 |
|
Brian.Dyke
|
73efa466f9
|
Merged 13.5.5-1 into 1412
Former-commit-id: 65ad515a6e [formerly 188d84cc87] [formerly 65ad515a6e [formerly 188d84cc87] [formerly 35ad867281 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]]
Former-commit-id: 35ad867281
Former-commit-id: c0266e8988 [formerly 72618c4214]
Former-commit-id: 737283b94a
|
2014-04-16 12:09:12 -04:00 |
|
Nate Jensen
|
7031f73fe2
|
Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
Former-commit-id: 9ebedf0b98 [formerly d121f07e76] [formerly 9ebedf0b98 [formerly d121f07e76] [formerly e0ae9e5f8f [formerly 8e8bc62e063da4a8a864496ac6dbd73e798e45ed]]]
Former-commit-id: e0ae9e5f8f
Former-commit-id: 736c2cc764 [formerly e0ffa7b6b4]
Former-commit-id: 700080e879
|
2014-04-16 08:41:54 -05:00 |
|
Ron Anderson
|
072102dff0
|
Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: 2a68e875a5 [formerly 6e0147169f] [formerly 2a68e875a5 [formerly 6e0147169f] [formerly 9f085a0856 [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]
Former-commit-id: 9f085a0856
Former-commit-id: a6fa60f40d [formerly 4622ad9b8a]
Former-commit-id: 56a1b8b682
|
2014-04-15 17:22:12 -05:00 |
|
Ben Steffensmeier
|
7dc8709a5b
|
Issue #3017 Update SatSpatialFactory to have more specific methods.
Former-commit-id: 49ca556b33 [formerly ecbe6fd2d7] [formerly 49ca556b33 [formerly ecbe6fd2d7] [formerly 6ea38cfbb2 [formerly 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc]]]
Former-commit-id: 6ea38cfbb2
Former-commit-id: 2f51d63032 [formerly 3eebc7a864]
Former-commit-id: af826302a1
|
2014-04-15 13:29:05 -05:00 |
|
Steve Harris
|
ac077b24a1
|
Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
Former-commit-id: 9132d9004e [formerly eb2f2865fe] [formerly 9132d9004e [formerly eb2f2865fe] [formerly 5bf5bdb6b0 [formerly f4c8ce899d312b389aff32d052564559e79904be]]]
Former-commit-id: 5bf5bdb6b0
Former-commit-id: 6ed279d306 [formerly c361ccd531]
Former-commit-id: 9be8c87f87
|
2014-04-15 09:39:33 -05:00 |
|
Benjamin Phillippe
|
f026a17b07
|
Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 490413551b [formerly 3db751fc5b] [formerly 490413551b [formerly 3db751fc5b] [formerly 62062bf288 [formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]]]
Former-commit-id: 62062bf288
Former-commit-id: 0b149f92d9 [formerly 035272360b]
Former-commit-id: f6f51d3575
|
2014-04-15 09:15:12 -05:00 |
|
brian.dyke
|
6a5c7d7684
|
Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: 5fc07cafc8 [formerly fb1c399d4d] [formerly 5fc07cafc8 [formerly fb1c399d4d] [formerly a6708cc174 [formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]]]
Former-commit-id: a6708cc174
Former-commit-id: e8dffad9cb [formerly 5b27f2987f]
Former-commit-id: d148fbe645
|
2014-04-14 15:29:23 -04:00 |
|
Zhidong.Hao
|
2b0fd93679
|
ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1
Former-commit-id: f5877f5fb0 [formerly 0b499061da] [formerly f5877f5fb0 [formerly 0b499061da] [formerly 9c18f60924 [formerly 015d4307168ca7fbc70bf0ae0e2e9abd24463d90]]]
Former-commit-id: 9c18f60924
Former-commit-id: 3adcd5bca5 [formerly 13808687c1]
Former-commit-id: 7996e95745
|
2014-04-11 15:51:12 -04:00 |
|
Zhidong.Hao
|
a846d4c4f5
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c
Former-commit-id: 48ee7712c7 [formerly 009c6e067a] [formerly 48ee7712c7 [formerly 009c6e067a] [formerly 1a91b820d9 [formerly 30eba1a2397c41fed1b564af4c31791040b14eac]]]
Former-commit-id: 1a91b820d9
Former-commit-id: ab0c9a65d2 [formerly c6d9a3926e]
Former-commit-id: a94bf1a110
|
2014-04-11 15:34:06 -04:00 |
|
Brian.Dyke
|
8cc1d09d35
|
ASM #465 - Update capture script to prevent hanging when running psql
Change-Id: I74c9fe349509850522a8bee37f34664559435d3c
Former-commit-id: af5cbe3321 [formerly 192a5513df] [formerly af5cbe3321 [formerly 192a5513df] [formerly deff8ed340 [formerly 17ab69323dd1b420662db25e09b05e3408d3f2ab]]]
Former-commit-id: deff8ed340
Former-commit-id: 4efe23ee2c [formerly 97687e7217]
Former-commit-id: 52efde1ca0
|
2014-04-11 11:18:06 -04:00 |
|
brian.dyke
|
f299a28f9b
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 6a9ccba393 [formerly 6575f77fe3] [formerly 6a9ccba393 [formerly 6575f77fe3] [formerly a8d6d58f31 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]]
Former-commit-id: a8d6d58f31
Former-commit-id: 88ddd667b6 [formerly ad63114f16]
Former-commit-id: 1c4e02168c
|
2014-04-11 10:58:48 -04:00 |
|
Brian.Dyke
|
fbefee3e1d
|
Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: 73be1016c0 [formerly 8c2f601b59] [formerly 73be1016c0 [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: afc1da9015 [formerly ff51498036]
Former-commit-id: f051b95a7a
|
2014-04-10 13:26:42 -04:00 |
|
Richard Peter
|
421b2716a4
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 5676090443 [formerly 95eba8dcf6] [formerly 5676090443 [formerly 95eba8dcf6] [formerly b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]
Former-commit-id: b15d288530
Former-commit-id: f1b85f6964 [formerly 73aab15d85]
Former-commit-id: b667e0509f
|
2014-04-09 16:00:54 -05:00 |
|
Steve Harris
|
bab730727e
|
Merge branch 'master_14.2.2' (14.2.2-3) into omaha_14.2.2
Former-commit-id: 842e355cc7 [formerly ae196946b9] [formerly 842e355cc7 [formerly ae196946b9] [formerly 2ea3d45ecc [formerly 0b9acf9e28c1048bd3b98af7c04e6953c8425e81]]]
Former-commit-id: 2ea3d45ecc
Former-commit-id: cf3bc163b6 [formerly 2efe4d5c6f]
Former-commit-id: d2f3b72736
|
2014-04-09 13:24:52 -05:00 |
|
Brian.Dyke
|
8ef50f023b
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: e4136f79dd [formerly 947194c998] [formerly e4136f79dd [formerly 947194c998] [formerly 929b736038 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]
Former-commit-id: 929b736038
Former-commit-id: d76d3a26cb [formerly 5163a31a66]
Former-commit-id: 462952ce65
|
2014-04-09 11:39:07 -04:00 |
|
Brian.Dyke
|
c99b4f3027
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 529059851a [formerly 20fef0f15b] [formerly 529059851a [formerly 20fef0f15b] [formerly 79c7ec7ae9 [formerly 92976dff4bbc7ed3c73600f061b5d8ba58dbeb35]]]
Former-commit-id: 79c7ec7ae9
Former-commit-id: 20c27a479d [formerly 538b02e42b]
Former-commit-id: c58835a7e3
|
2014-04-08 13:05:12 -04:00 |
|
Ben Steffensmeier
|
5306c9969d
|
Issue #2973 Use correct area for expanding subgrid requests.
Former-commit-id: 5b3a8dccbf [formerly 90f1750691] [formerly 5b3a8dccbf [formerly 90f1750691] [formerly 000f259cf4 [formerly 3cc81be3ed534aed54bf80b0654f28f7fd86cc8b]]]
Former-commit-id: 000f259cf4
Former-commit-id: d52be1875d [formerly 7b2f82ff30]
Former-commit-id: 7bd153a696
|
2014-04-04 13:17:36 -05:00 |
|
Brian.Dyke
|
39b5e7fe67
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 17477e7db1 [formerly 6a28fcb156] [formerly 17477e7db1 [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]
Former-commit-id: dd98c213c7
Former-commit-id: 47d9095211 [formerly 9f37f61cf8]
Former-commit-id: be574897cc
|
2014-04-04 12:57:32 -04:00 |
|
steve.naples
|
32e931cead
|
ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly.
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5
Former-commit-id: 75be620d0d [formerly f6636a3dd7] [formerly 75be620d0d [formerly f6636a3dd7] [formerly 7624f7ab75 [formerly 1c71a34944c7d823742b98dc65e19fe1f478eef0]]]
Former-commit-id: 7624f7ab75
Former-commit-id: cfa9c6f01c [formerly 050238ee44]
Former-commit-id: 571efe3596
|
2014-04-04 15:30:18 +00:00 |
|
Steve Harris
|
fecb1acc59
|
Merge branch 'master_14.2.2' (14.2.2-1,2) into omaha_14.2.2
Former-commit-id: 4e65ecbf48 [formerly 15bc450e94] [formerly 4e65ecbf48 [formerly 15bc450e94] [formerly 58b8f72755 [formerly dd2ee3c6bb1fa1e3f1cde475da50d5e545446ed8]]]
Former-commit-id: 58b8f72755
Former-commit-id: 0bb0d02522 [formerly 01bdd24b6c]
Former-commit-id: ab51128b44
|
2014-04-03 13:08:28 -05:00 |
|
Steve Harris
|
f1c20fbc92
|
Merge branch 'master_14.2.1' (14.2.1-16) into omaha_14.2.1
Former-commit-id: 4b96900460 [formerly acd5392e9a] [formerly 4b96900460 [formerly acd5392e9a] [formerly cb2d69e338 [formerly ce1a2d441c1c882209f56fcb82f79edad51ff114]]]
Former-commit-id: cb2d69e338
Former-commit-id: 4e8a672c77 [formerly 09285db2d4]
Former-commit-id: 9bece467e0
|
2014-04-03 13:00:11 -05:00 |
|
Ron Anderson
|
0033d7d3ef
|
Issue #2969 Fixed error when Topo parm is unloaded.
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: 346984b8ab [formerly 11fbd86558] [formerly 346984b8ab [formerly 11fbd86558] [formerly d556055299 [formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]]]
Former-commit-id: d556055299
Former-commit-id: 3ac3d5de1b [formerly ac7c5460f6]
Former-commit-id: 4e88052beb
|
2014-04-02 09:07:22 -05:00 |
|
Greg Armendariz
|
cd8507faf2
|
Merge "Issue #2949 Updated scripts Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80" into omaha_14.2.1
Former-commit-id: 50fb1ec68a [formerly 6b339bcb86] [formerly 50fb1ec68a [formerly 6b339bcb86] [formerly 0d0d7bd513 [formerly 8d8277705568c04ac37bbe8f09bf7f38f2f0521f]]]
Former-commit-id: 0d0d7bd513
Former-commit-id: 380542d2eb [formerly cef70f2168]
Former-commit-id: 1ae96a358d
|
2014-04-01 19:33:30 -05:00 |
|
Richard Peter
|
034e62d64e
|
Issue #2509: Fix stitched grid notifications
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4
Former-commit-id: bfba75f73f [formerly 53d5000261] [formerly bfba75f73f [formerly 53d5000261] [formerly f99875040c [formerly 861f0c09baa01e191b430bce6699c0f1c95a52d2]]]
Former-commit-id: f99875040c
Former-commit-id: b32eff04be [formerly 9ac8af6ccd]
Former-commit-id: 154034d653
|
2014-04-01 14:44:05 -05:00 |
|
Brian.Dyke
|
c2a3ec6f04
|
Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2
Former-commit-id: 3186434368 [formerly 6e515eb334] [formerly 3186434368 [formerly 6e515eb334] [formerly 1f5c6139e3 [formerly 5dbe50379db1558323dff2ffdc541cd81adfea4b]]]
Former-commit-id: 1f5c6139e3
Former-commit-id: d163d9d190 [formerly c013460db1]
Former-commit-id: 5345add58d
|
2014-04-01 14:29:33 -04:00 |
|
Dave Hladky
|
24724a8819
|
Issue #2949 Updated scripts
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80
Former-commit-id: 41e43a169b [formerly 3d6ebf498e] [formerly 41e43a169b [formerly 3d6ebf498e] [formerly ede510dd91 [formerly afcfc72329522c2d731a4afe9353632effb9cb23]]]
Former-commit-id: ede510dd91
Former-commit-id: b202d62214 [formerly be18d1f63c]
Former-commit-id: a3ac9604e6
|
2014-04-01 12:33:48 -05:00 |
|
David Gillingham
|
14f927fe54
|
Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1.
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9
Former-commit-id: 402adfeddb [formerly a529bc8cad] [formerly 402adfeddb [formerly a529bc8cad] [formerly 70b28b4e1e [formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]]]
Former-commit-id: 70b28b4e1e
Former-commit-id: 64981356c8 [formerly 22266d36b9]
Former-commit-id: 3ad0872bda
|
2014-03-31 15:49:33 -05:00 |
|
David Friedman
|
8f8f55dd3c
|
Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: 32a7adbe4b [formerly fd900e38c2] [formerly 32a7adbe4b [formerly fd900e38c2] [formerly f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1168a3eae5 [formerly 533d15c863]
Former-commit-id: dde12b4fc3
|
2014-03-27 19:17:03 +00:00 |
|
Brian.Dyke
|
102414db3a
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: a1b980a15d [formerly 6346c9776b] [formerly a1b980a15d [formerly 6346c9776b] [formerly 3b639347f8 [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]]
Former-commit-id: 3b639347f8
Former-commit-id: 519ec3071a [formerly 76625c2238]
Former-commit-id: 9fa73765f9
|
2014-03-27 10:22:26 -04:00 |
|
Steve Harris
|
76def67552
|
Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: d940427408 [formerly 53f91fdeea] [formerly d940427408 [formerly 53f91fdeea] [formerly e5910b6c60 [formerly b0b18895aa445ee9b29674443529558b2141c042]]]
Former-commit-id: e5910b6c60
Former-commit-id: 9d4f24da7b [formerly 1b9ebbddcc]
Former-commit-id: 7a7a9cc18e
|
2014-03-26 16:13:59 -05:00 |
|