Ron Anderson
|
1831bfcc16
|
Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce
Former-commit-id: bd96a807ed [formerly c5a32980d6] [formerly c7fbca0298] [formerly c7fbca0298 [formerly 46c62a1db6]] [formerly bd96a807ed [formerly c5a32980d6] [formerly c7fbca0298] [formerly c7fbca0298 [formerly 46c62a1db6]] [formerly 434d412882 [formerly c7fbca0298 [formerly 46c62a1db6] [formerly 434d412882 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]]]]]
Former-commit-id: 434d412882
Former-commit-id: dea9fd7247 [formerly 215d5f262e] [formerly 19ce2bb34e] [formerly 224cce7aebf99b89c95d0c61f7088f75b7d6a2d6 [formerly d4fadbd148424d34474cdcf3ba53cd32ad36b1f0] [formerly 19ce2bb34e [formerly 24fba5cc20]]]
Former-commit-id: 0f781eeee633aae4eb5625535c65fe2d612f95d8 [formerly 00a79119c6c0303cfa622498ee2804eb04c1903f] [formerly 699fe1637e [formerly cad80d1060]]
Former-commit-id: 699fe1637e
Former-commit-id: dd329dbd57
|
2014-09-02 12:21:42 -05:00 |
|
Steve Harris
|
4e50d049dc
|
Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: af703a1259 [formerly 9e79ff1cff] [formerly f7e39c9d6f] [formerly f7e39c9d6f [formerly 3b6a003884]] [formerly af703a1259 [formerly 9e79ff1cff] [formerly f7e39c9d6f] [formerly f7e39c9d6f [formerly 3b6a003884]] [formerly e7705c328e [formerly f7e39c9d6f [formerly 3b6a003884] [formerly e7705c328e [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]]]]]
Former-commit-id: e7705c328e
Former-commit-id: 50324c3cbf [formerly 6184a8ef57] [formerly 79c7e0b492] [formerly 54a00b3063dd5d6881f9ac220cda3430b2baa3cb [formerly 5cde04894fc320a0e396dcbcda7917b88bf7faf3] [formerly 79c7e0b492 [formerly 92a45c76fb]]]
Former-commit-id: 7a346d0f22f78ac2744045ade24cba5016815b8a [formerly d186fe408ae810a2d706db3817a1118abbd73681] [formerly f1c77c42ed [formerly 6279cdb55c]]
Former-commit-id: f1c77c42ed
Former-commit-id: a8dce1da7e
|
2014-09-02 08:12:49 -05:00 |
|
Brian Clements
|
78aa849820
|
Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040
Former-commit-id: 16422cd607 [formerly c0b132d6ee] [formerly 981390eb22] [formerly 981390eb22 [formerly b352bd3944]] [formerly 16422cd607 [formerly c0b132d6ee] [formerly 981390eb22] [formerly 981390eb22 [formerly b352bd3944]] [formerly cfeb16eff8 [formerly 981390eb22 [formerly b352bd3944] [formerly cfeb16eff8 [formerly b3482522860408c2d052261e845899cf73c2ce96]]]]]
Former-commit-id: cfeb16eff8
Former-commit-id: 24ad951025 [formerly 3015aef7b9] [formerly c337087043] [formerly c567b1891a59681a9dfdb4738db35d029ca0b1fa [formerly da0614500f744bdca9a9cd20f1050898018e3164] [formerly c337087043 [formerly a2010c729a]]]
Former-commit-id: 97eb7a2e5a5701cb524f44a9357594532e4b6186 [formerly 378c8cc0cd2c0288760022a651b07b1c9c74ada1] [formerly e9eb97a8fb [formerly 139466b9ef]]
Former-commit-id: e9eb97a8fb
Former-commit-id: a3fa77d796
|
2014-08-29 08:55:58 -05:00 |
|
Roger Ferrel
|
bddbc0a564
|
Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec
Former-commit-id: bd600e2331 [formerly 60d6b770aa] [formerly 15c73be56c] [formerly 15c73be56c [formerly 6f8c6d6aa1]] [formerly bd600e2331 [formerly 60d6b770aa] [formerly 15c73be56c] [formerly 15c73be56c [formerly 6f8c6d6aa1]] [formerly ef5dfb1f93 [formerly 15c73be56c [formerly 6f8c6d6aa1] [formerly ef5dfb1f93 [formerly bcc9b0a6352151dfdf3ba75063bb87308cb162b4]]]]]
Former-commit-id: ef5dfb1f93
Former-commit-id: bf7fc6e2d5 [formerly 6fcac050be] [formerly ffa95bce90] [formerly e8f4ce59f8e57e67af55102c4302773cd2f611f1 [formerly a75847a14ce68662ce3ae2487c06dcc0a6e1e748] [formerly ffa95bce90 [formerly fe50853adb]]]
Former-commit-id: 4e6b670a3dca842a796771d3398baa0fe6062679 [formerly 8abe9b8b145e7dc278af60c6258a58d392c001a0] [formerly 89f66db462 [formerly 86d4730538]]
Former-commit-id: 89f66db462
Former-commit-id: 9322cc494f
|
2014-08-28 13:10:11 -05:00 |
|
Brian.Dyke
|
75b49f0d37
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 07d163170f [formerly cbfd380b43] [formerly 76bd6575b6] [formerly 76bd6575b6 [formerly 47ae6015e5]] [formerly 07d163170f [formerly cbfd380b43] [formerly 76bd6575b6] [formerly 76bd6575b6 [formerly 47ae6015e5]] [formerly a24794ca7b [formerly 76bd6575b6 [formerly 47ae6015e5] [formerly a24794ca7b [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]]]]]
Former-commit-id: a24794ca7b
Former-commit-id: e9c3d0b262 [formerly 7288e9be2a] [formerly 065b05e38c] [formerly f7c6785d6d9d9e74292b4274283e724146705826 [formerly d87cfe22daebbd0f64708e2b5401b5a9bc43a95e] [formerly 065b05e38c [formerly 0e9a17540d]]]
Former-commit-id: fe0b41be97048432cd1086ea87818b355eb7fb5c [formerly 7849df2750377b7bb32208974c538f9b11a2620a] [formerly c5aec69ab3 [formerly bab69f3764]]
Former-commit-id: c5aec69ab3
Former-commit-id: 0ae9b53ca6
|
2014-08-28 11:39:48 -04:00 |
|
Richard Peter
|
db5eae3d88
|
Merge "Issue #3537 Fixed dirPattern in category Local." into omaha_14.2.4
Former-commit-id: ca3cd8faf5 [formerly 6396f11532] [formerly ab7facb903] [formerly ab7facb903 [formerly 4ba39c5e56]] [formerly ca3cd8faf5 [formerly 6396f11532] [formerly ab7facb903] [formerly ab7facb903 [formerly 4ba39c5e56]] [formerly 008a3e8f80 [formerly ab7facb903 [formerly 4ba39c5e56] [formerly 008a3e8f80 [formerly 5bb3f4a1215902e867d3e9ec5ca1d122067afd7e]]]]]
Former-commit-id: 008a3e8f80
Former-commit-id: 6477b1ef1e [formerly 7fc06eff0d] [formerly 17c2c42cd2] [formerly 53d43494db62632f51bce0d96c82735309c7124c [formerly db9e0e2a7fdda0d46fab9872d270205026e87d41] [formerly 17c2c42cd2 [formerly 2dd7596b68]]]
Former-commit-id: 3a5b2784527ba2556c15bf7a002b9c6b6854e2e1 [formerly 92d5a0993e2d368b76ebf331193aa7969087caf7] [formerly 752f328338 [formerly 8e073ab401]]
Former-commit-id: 752f328338
Former-commit-id: 02076146f3
|
2014-08-25 14:24:27 -05:00 |
|
Ron Anderson
|
847df4f9ea
|
Merge "Issue #3500 back port of loadConfig.py to fix gfe starup issue" into omaha_14.2.4
Former-commit-id: a61887db31 [formerly dee9a699ad] [formerly 03173a9fe7] [formerly 03173a9fe7 [formerly 4e6bbb4be4]] [formerly a61887db31 [formerly dee9a699ad] [formerly 03173a9fe7] [formerly 03173a9fe7 [formerly 4e6bbb4be4]] [formerly 4285719a08 [formerly 03173a9fe7 [formerly 4e6bbb4be4] [formerly 4285719a08 [formerly ae980bfccfedab3091b2708fae0dc36764dbffcb]]]]]
Former-commit-id: 4285719a08
Former-commit-id: 40332f6e3e [formerly 1e3a94e3e4] [formerly fe93cb7510] [formerly 5a15bd886a03ffd97902c74fd4481b108910137f [formerly 06e2debcd2974ef2d50793405e7728d260c70777] [formerly fe93cb7510 [formerly 6c3cafda59]]]
Former-commit-id: 80a913c6d84d8db67aba06262c15a441bbb7a54a [formerly b90a38bfc9b4cb38537b03a88e5468d30019bf90] [formerly a46f13d161 [formerly 566db58f13]]
Former-commit-id: a46f13d161
Former-commit-id: fc6ff76874
|
2014-08-25 14:04:41 -05:00 |
|
Brian Clements
|
f15d60caeb
|
Issue #3500 back port of loadConfig.py to fix gfe starup issue
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7
Former-commit-id: 6bdec13124 [formerly 5d794a5135] [formerly 960eb2dc29] [formerly 960eb2dc29 [formerly 4314f71387]] [formerly 6bdec13124 [formerly 5d794a5135] [formerly 960eb2dc29] [formerly 960eb2dc29 [formerly 4314f71387]] [formerly cf671dcda8 [formerly 960eb2dc29 [formerly 4314f71387] [formerly cf671dcda8 [formerly 2a0af03242692708b3e752417ca7d60d28520768]]]]]
Former-commit-id: cf671dcda8
Former-commit-id: 678bce9591 [formerly cb34376804] [formerly 253b14b895] [formerly 97e9c75a75cb4ca93b06a59741911421b47159d5 [formerly ad4290afd9237cad2ca05f14d0e5d7191bb86b8b] [formerly 253b14b895 [formerly f9756abf0a]]]
Former-commit-id: 97de2960ed0900458be1e25b2e6c9ce002d135d1 [formerly 1fb9f395c099428c7cfe4498866fb60825fb08d7] [formerly 05bfc2943c [formerly 7bc93588a1]]
Former-commit-id: 05bfc2943c
Former-commit-id: 776781b39c
|
2014-08-25 13:34:36 -05:00 |
|
Roger Ferrel
|
ee7c823f12
|
Issue #3537 Fixed dirPattern in category Local.
Former-commit-id: da06285f98 [formerly eb6992b3fa] [formerly 1ff321ce51] [formerly 1ff321ce51 [formerly c7a6040792]] [formerly da06285f98 [formerly eb6992b3fa] [formerly 1ff321ce51] [formerly 1ff321ce51 [formerly c7a6040792]] [formerly e451dd2814 [formerly 1ff321ce51 [formerly c7a6040792] [formerly e451dd2814 [formerly d40736ed992300be32ed4a62511fa436e9d167af]]]]]
Former-commit-id: e451dd2814
Former-commit-id: d321a1ccf5 [formerly a2d92f8552] [formerly 3d3f9cfb8c] [formerly 3c6eab7f5659fbdcb6e36300f39deb46e99717e3 [formerly dce5cb1b876921fa48d76b01c9951abb227edc02] [formerly 3d3f9cfb8c [formerly 6f566c0f38]]]
Former-commit-id: 21022fb43578a96d471e6b0e0f44f6d96878d22c [formerly 4e526b9ac8cf4abf3e1c0daffa70d6e08a61d447] [formerly 7a7a770dc6 [formerly 7e3024f4f2]]
Former-commit-id: 7a7a770dc6
Former-commit-id: cb510287d3
|
2014-08-25 13:23:44 -05:00 |
|
Nate Jensen
|
415c3f9d0d
|
Merge "Issue #3500 remove locking on osgi internals, rework gfe client startup" into omaha_14.2.4
Former-commit-id: c79a704e04 [formerly 41a7e2dbcd] [formerly 0852d804ba] [formerly 0852d804ba [formerly 5e46c55a76]] [formerly c79a704e04 [formerly 41a7e2dbcd] [formerly 0852d804ba] [formerly 0852d804ba [formerly 5e46c55a76]] [formerly d66ac29640 [formerly 0852d804ba [formerly 5e46c55a76] [formerly d66ac29640 [formerly bb08cb510dc3d774e040b7d3a164dfa1d581aa1c]]]]]
Former-commit-id: d66ac29640
Former-commit-id: bc9cd1710b [formerly 702239de9f] [formerly d824e365d1] [formerly e85279b2fceda75b9efc91a3b67d774600e4524f [formerly 4fa0bfb69b17bae7253b0667ffaee25774b64820] [formerly d824e365d1 [formerly 5c943c5ddc]]]
Former-commit-id: b4a509f92858f6db4b2ecfaed8cab2f176c05427 [formerly d618491bf8793852bfbd3ec1383e25783451911a] [formerly 6bb1e7d4bd [formerly 18902f8c9a]]
Former-commit-id: 6bb1e7d4bd
Former-commit-id: 81796e4d08
|
2014-08-25 13:12:46 -05:00 |
|
Brian.Dyke
|
2b2385cc37
|
Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: 6434bfcf3c [formerly aecf73e71a] [formerly a841eb53e5] [formerly a841eb53e5 [formerly a4376ec79f]] [formerly 6434bfcf3c [formerly aecf73e71a] [formerly a841eb53e5] [formerly a841eb53e5 [formerly a4376ec79f]] [formerly 0fbc5269ea [formerly a841eb53e5 [formerly a4376ec79f] [formerly 0fbc5269ea [formerly e673b3ff82b52be4cd4fbe2dab0859b98678f6ef]]]]]
Former-commit-id: 0fbc5269ea
Former-commit-id: 0bfd904a66 [formerly f72c19fd3c] [formerly caa50716ff] [formerly c2c5adbff56774a18b0530ca40838e4167454f77 [formerly 6d6fe3691f712c1bf4868acb2bc3528ca639977e] [formerly caa50716ff [formerly 13d523eede]]]
Former-commit-id: a2f80da8dddc0dd903a0af7ac4e5bc8b5e620fb5 [formerly 23276a6c95a3ff3542db1d52456372fdad964d1a] [formerly d9ac0d95d4 [formerly 20c4fb88d5]]
Former-commit-id: d9ac0d95d4
Former-commit-id: 9a5fa53446
|
2014-08-22 16:40:51 -04:00 |
|
Brian.Dyke
|
6a99c2269e
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: e6e748f80c [formerly 6402cb7d89] [formerly 2ddc920a4a] [formerly 2ddc920a4a [formerly 325887e605]] [formerly e6e748f80c [formerly 6402cb7d89] [formerly 2ddc920a4a] [formerly 2ddc920a4a [formerly 325887e605]] [formerly dd9d7133d9 [formerly 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]]]
Former-commit-id: dd9d7133d9
Former-commit-id: b1125b7ead [formerly e348a6abc7] [formerly c8e9153884] [formerly aeb4c05a55d78fcd7c75024d8266f07f6153e495 [formerly 7dbc20e2697aab4991870bf8493b74b08acbe56b] [formerly c8e9153884 [formerly 1839b614df]]]
Former-commit-id: 4ebaf1487954a27857fde0b53c4ede7217a27c50 [formerly 85ccff40908964b07fef1c572de049c609434728] [formerly 27372f098c [formerly cd1b914f50]]
Former-commit-id: 27372f098c
Former-commit-id: 272905b186
|
2014-08-22 14:16:22 -04:00 |
|
Brian.Dyke
|
bf565e384f
|
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: f25f86cf2a [formerly 64effd458c] [formerly 5b2b0d2bd9] [formerly 5b2b0d2bd9 [formerly a830b6d94c]] [formerly f25f86cf2a [formerly 64effd458c] [formerly 5b2b0d2bd9] [formerly 5b2b0d2bd9 [formerly a830b6d94c]] [formerly 94577a1626 [formerly 5b2b0d2bd9 [formerly a830b6d94c] [formerly 94577a1626 [formerly b2674ef57183706feb2bb17175d730bb2e213281]]]]]
Former-commit-id: 94577a1626
Former-commit-id: b8c9e37b47 [formerly 9c119c8431] [formerly 0cbbceb7e3] [formerly 4b3916f49cdc4aeb92e16f6e74ebe2a73cf4d094 [formerly 5ebef4a85e30ac73432bcaf6ac7df852b8d06f7e] [formerly 0cbbceb7e3 [formerly a0af10ff2e]]]
Former-commit-id: 3e7908a6f5da8bbc3a094c74d7400063addb06b4 [formerly 522edbdb9ffeff69b90b3db092cedb88b93eea4b] [formerly 5a878760f1 [formerly d0a2060e84]]
Former-commit-id: 5a878760f1
Former-commit-id: 348b4c12e9
|
2014-08-22 14:13:48 -04:00 |
|
steve.naples
|
bb378cac50
|
ASM #15664 Fixed issue with Tear Off menus not closing when perspective is closed, which caused an error.
Change-Id: If5fd120b7b34074686492d4cab9268ec1ac51a41
Former-commit-id: 8bb04442c7 [formerly 5345a81859] [formerly 1bde9a4013] [formerly 1bde9a4013 [formerly c2bb43944c]] [formerly 8bb04442c7 [formerly 5345a81859] [formerly 1bde9a4013] [formerly 1bde9a4013 [formerly c2bb43944c]] [formerly 7690281c5c [formerly 1bde9a4013 [formerly c2bb43944c] [formerly 7690281c5c [formerly e719245823220d7b583ffdb0adc88c8b71321369]]]]]
Former-commit-id: 7690281c5c
Former-commit-id: ef1ec85c2e [formerly 6710f1b499] [formerly a3443402f2] [formerly 9afe8c05d261b0ab736eb44d58083c200f90cc6a [formerly 48f6372c443d2dc759583c40eb155abec6fa9133] [formerly a3443402f2 [formerly 560cf97a6f]]]
Former-commit-id: e95fc0716d37af36341ad092356d95db3f06c8c6 [formerly a68aaacc0437ee9a353afd856e130fb189e7f671] [formerly b0240d7710 [formerly 162cba6657]]
Former-commit-id: b0240d7710
Former-commit-id: 51ad18da35
|
2014-08-22 15:21:35 +00:00 |
|
Brian Clements
|
61f0ecb8c9
|
Issue #3500 remove locking on osgi internals, rework gfe client startup
fixed error handling in loadConfig.py
added python to path in GfePyIncludeUtil
moved ProcedureXMLManager to overridable method in AbstractCaveComponent
Change-Id: Ie7dff55657ba216c47f7a56b3506cbed3a3f6ab2
Former-commit-id: 9b0a34c5e3 [formerly d3f0f7dea4] [formerly bcc3e405e5] [formerly bcc3e405e5 [formerly d62db22874]] [formerly 9b0a34c5e3 [formerly d3f0f7dea4] [formerly bcc3e405e5] [formerly bcc3e405e5 [formerly d62db22874]] [formerly 9f7905b58d [formerly bcc3e405e5 [formerly d62db22874] [formerly 9f7905b58d [formerly b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684]]]]]
Former-commit-id: 9f7905b58d
Former-commit-id: 1243491323 [formerly b5bc73c517] [formerly d2c4e847ba] [formerly 3f5163690019e322b2e95b482ad1e3d903295d22 [formerly d45fd23deea0c9c7a5c6f3243a512210f490288a] [formerly d2c4e847ba [formerly 561977ecba]]]
Former-commit-id: f92779d5f8f710b96df2eaaa39f459d717986d5f [formerly 3e55f9cbe722bd44a7ad79c1733b24c7add3f40e] [formerly 930d64d738 [formerly 29a7557a0c]]
Former-commit-id: cbc1e200890a97f354ef91aedbe7f99c7fdd1e56 [formerly 930d64d738]
Former-commit-id: a87e344a27
|
2014-08-22 08:56:56 -05:00 |
|
Brian.Dyke
|
44b2d7affc
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 850fee7d70 [formerly d4d26aaf75] [formerly f6748f1e28] [formerly f6748f1e28 [formerly 14d21b336d]] [formerly 850fee7d70 [formerly d4d26aaf75] [formerly f6748f1e28] [formerly f6748f1e28 [formerly 14d21b336d]] [formerly aaabfa6cd0 [formerly f6748f1e28 [formerly 14d21b336d] [formerly aaabfa6cd0 [formerly 614b2bb59424f01d2608cd2db3a14dbcd77c90e6]]]]]
Former-commit-id: aaabfa6cd0
Former-commit-id: 930435a07d [formerly 41b4a9a504] [formerly 5b188a713b] [formerly df92a7a7ad0677ae336434b8e403df4c1b65df68 [formerly 2bb78d3c5817cd77bb1da9ea0f462ed769072ce7] [formerly 5b188a713b [formerly d419fc59ff]]]
Former-commit-id: 972809034bddfc9ecc26d07e2b5637ee8db5e77d [formerly 040f26f492eaea82f769d1ff4ae1fc168100f2f9] [formerly 5b4d83e8a5 [formerly a29865b064]]
Former-commit-id: 5b4d83e8a5
Former-commit-id: 1d5e5f779f
|
2014-08-21 12:07:16 -04:00 |
|
Brian.Dyke
|
85c3afe720
|
VLab Issue #3648 - Corrected NCEP additions for ESTOFS model -fix gribModels_NCEP-7.xml tag
Former-commit-id: e9defe3c93 [formerly e9cd8aba20] [formerly 93be1a54c7] [formerly 93be1a54c7 [formerly 7b8fef0fa3]] [formerly e9defe3c93 [formerly e9cd8aba20] [formerly 93be1a54c7] [formerly 93be1a54c7 [formerly 7b8fef0fa3]] [formerly ae5656ca46 [formerly 93be1a54c7 [formerly 7b8fef0fa3] [formerly ae5656ca46 [formerly 1b83b788aee082b489ce0fe5dc6d775e2f621e01]]]]]
Former-commit-id: ae5656ca46
Former-commit-id: f6bfb4b18f [formerly 1382e07119] [formerly 17b9ae1418] [formerly 8f8f6856215e8c8c61e73c0af2008ab5513ce337 [formerly b70337fe76136addade0078d2a3e33f5ca57b9cf] [formerly 17b9ae1418 [formerly bcf53f53da]]]
Former-commit-id: f5c55e88793e2d3766a90faee6c5c62e7d55bd02 [formerly ece4562da20dabf5134e7571432e44bc329487c2] [formerly aa4fad07e8 [formerly d5bcfff431]]
Former-commit-id: aa4fad07e8
Former-commit-id: 00b3705149
|
2014-08-21 11:07:02 -04:00 |
|
Qinglu.Lin
|
828c4a9e92
|
ASM #15700 - Warngen issues an error and toggles off on Radar update
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b
Former-commit-id: 49d40dcaad [formerly bd03ec7a6f] [formerly 3cc94603a2] [formerly 3cc94603a2 [formerly fb92838427]] [formerly 49d40dcaad [formerly bd03ec7a6f] [formerly 3cc94603a2] [formerly 3cc94603a2 [formerly fb92838427]] [formerly 2157a4aa3b [formerly 3cc94603a2 [formerly fb92838427] [formerly 2157a4aa3b [formerly b8a4741b2519e8c02a1b80ba8544be9b1c26d35c]]]]]
Former-commit-id: 2157a4aa3b
Former-commit-id: 2c9cefb7cc [formerly 2cde7ae918] [formerly 787f157850] [formerly 5f5d6357d66ace0188b5112e5d26c63e0c2e9d4e [formerly 0f8e6a12a3a39382b7066fa24db8ef861b31c909] [formerly 787f157850 [formerly 3037a17366]]]
Former-commit-id: f13c8aadba268d1fb699654f07dafc55f2ba0b8e [formerly b6f56818727e927936380f47630dfcdd4372ea9f] [formerly 77e6647de8 [formerly 040e1071b2]]
Former-commit-id: 77e6647de8
Former-commit-id: 90cab42717
|
2014-08-21 10:43:22 -04:00 |
|
Zihou Wang
|
21154bbd2d
|
VLab Issue #4464 - DR_17214 RADAR: NEXRAD Unit Status display problem due to the GSM change; fixes #4464
Change-Id: I0ca330e385000e04ef21142e75adfc55d4615a89
Former-commit-id: ff4b5d5570 [formerly 4d1413888c] [formerly dde3ee4904] [formerly dde3ee4904 [formerly 3ffac397db]] [formerly ff4b5d5570 [formerly 4d1413888c] [formerly dde3ee4904] [formerly dde3ee4904 [formerly 3ffac397db]] [formerly a2a2a8cdf9 [formerly dde3ee4904 [formerly 3ffac397db] [formerly a2a2a8cdf9 [formerly 288dc7c439995a8ab48680832b63f7d6974885b4]]]]]
Former-commit-id: a2a2a8cdf9
Former-commit-id: de2a8cc881 [formerly 79a8578e66] [formerly 698321896d] [formerly c97ca2cc6c9b1594a4609815a7b94346df202d1a [formerly f2f1588b1c6b769b07f0455787bd95832d5a280f] [formerly 698321896d [formerly 0785965b62]]]
Former-commit-id: b89bb6cffc9b07fb6a7f0ea34661d2ad8a7c690e [formerly d1164f57476b696b329fdb6874a8a95d5fbaf063] [formerly 7c6cf0642f [formerly a7a47a11ca]]
Former-commit-id: ef14937c20f4aaf644769a2b91099e0c7e0f782f [formerly 7c6cf0642f]
Former-commit-id: acbfe1c1d5
|
2014-08-21 12:04:30 +00:00 |
|
steve.naples
|
0daf3f5e6e
|
ASM #14807 Updated snow file parser in ReadSnowData to fix parsing issues.
Change-Id: I5182f2640baebbb0f5c6d66e5a3d81da7461af69
Former-commit-id: 55aa953ade [formerly ccd7b7e2ad] [formerly 765fa2dc4e] [formerly 765fa2dc4e [formerly 179031d9b4]] [formerly 55aa953ade [formerly ccd7b7e2ad] [formerly 765fa2dc4e] [formerly 765fa2dc4e [formerly 179031d9b4]] [formerly 4be6abad1b [formerly 765fa2dc4e [formerly 179031d9b4] [formerly 4be6abad1b [formerly 67e36d96d0acaa8dfdf61164a5c66fbda9dd753b]]]]]
Former-commit-id: 4be6abad1b
Former-commit-id: 9fab9c5492 [formerly 82c2f494ab] [formerly 57396fa455] [formerly 145fe39f5d3a796653ed6e0f824e866103154a5f [formerly 7855fd9b5ed6688a80c65ec137f9fc39406ae743] [formerly 57396fa455 [formerly cb000115cb]]]
Former-commit-id: bcfa021e7309c7fddb491580aded067412f1d658 [formerly 154bf57d993d152ab23cba2faed29a5a2514527d] [formerly 819ed0b12e [formerly c9f3159b05]]
Former-commit-id: 819ed0b12e
Former-commit-id: 9cbbecd30e
|
2014-08-20 17:17:14 +00:00 |
|
Ron Anderson
|
56961d4f2c
|
Issue #3526 Fix bug in WECache that caused ISC grids to be removed
Change-Id: I49feb0d093a75c83b9a09deeed15e81cf0ed967b
Former-commit-id: f7d1610250 [formerly 07ea3be623] [formerly a19f819e44] [formerly a19f819e44 [formerly 62236ee92a]] [formerly f7d1610250 [formerly 07ea3be623] [formerly a19f819e44] [formerly a19f819e44 [formerly 62236ee92a]] [formerly 8c4cb3b4ae [formerly a19f819e44 [formerly 62236ee92a] [formerly 8c4cb3b4ae [formerly edd1c5d77ec7a84b5807134d863d59147a846405]]]]]
Former-commit-id: 8c4cb3b4ae
Former-commit-id: ad92d7a3d7 [formerly 366e6688de] [formerly 11dd687ef7] [formerly c907b5716ee221522947d72fdda011131c1f8268 [formerly e89e5bdd4418ddd0fe42f0316f4e3cd080733fb4] [formerly 11dd687ef7 [formerly a41384e4d6]]]
Former-commit-id: a113e7fe887fa3d36a9190732b5182fd1da7d273 [formerly 9732798c71cdf2ff6f51cf8349775ec115430dc1] [formerly f112c5e056 [formerly 2fa509c56f]]
Former-commit-id: f112c5e056
Former-commit-id: d5fc7cb86a
|
2014-08-20 11:03:03 -05:00 |
|
Zihou Wang
|
f304285446
|
VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; fixes #3990
Change-Id: Ib6be85a3fb40649a093c8cd5d9278f324edb3a7f
Former-commit-id: f2eafb9460 [formerly 9f6cb88fb6] [formerly 3fa6a7840e] [formerly bc1adc46c43d09dba76ceff4dda7b3486ba30667 [formerly 3fa6a7840e [formerly 9b68bea7c3]]] [formerly f2eafb9460 [formerly 9f6cb88fb6] [formerly 3fa6a7840e] [formerly bc1adc46c43d09dba76ceff4dda7b3486ba30667 [formerly 3fa6a7840e [formerly 9b68bea7c3]]] [formerly 45d8572343 [formerly 3fa6a7840e [formerly 9b68bea7c3] [formerly 45d8572343 [formerly 3d305bffddf34d38b65176280e40709549f09ee5]]]]]
Former-commit-id: 45d8572343
Former-commit-id: ab9b1de2b4 [formerly dc34f74979] [formerly c7cb18c58a] [formerly 846aaec1630ac319a56cc599a0c47d89c28890ac [formerly 1e9537b22bfc30e8cad382d6481a37811bc21006] [formerly c7cb18c58a [formerly bf7d95c9b4]]]
Former-commit-id: 73852ba4bd56b6bba81b4e324d89fc29a12ebcf3 [formerly eb2c829581ed8d8f6c5f3c743c55c70877817511] [formerly 747c05ce39 [formerly 1339b41cb5]]
Former-commit-id: 747c05ce39
Former-commit-id: 216f228716
|
2014-08-20 14:20:17 +00:00 |
|
David Friedman
|
626bc17ad0
|
ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f
Former-commit-id: 737451a0cf [formerly 280f4a4b64] [formerly b053e1e2ce] [formerly b053e1e2ce [formerly 78ee5a56c5]] [formerly 737451a0cf [formerly 280f4a4b64] [formerly b053e1e2ce] [formerly b053e1e2ce [formerly 78ee5a56c5]] [formerly 6a7638ddae [formerly b053e1e2ce [formerly 78ee5a56c5] [formerly 6a7638ddae [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]]]]]
Former-commit-id: 6a7638ddae
Former-commit-id: f75f6b4be6 [formerly 4f3458f5fb] [formerly 95fbbdf730] [formerly a97a86c57b19848fb6b1ef6aca0ac16e5ace687d [formerly e0968bdffeb4e1072679ff80338a84d7bb82e1e9] [formerly 95fbbdf730 [formerly 76d78ff72e]]]
Former-commit-id: fd9962dfe412b7f031d706160678f46a92bfe52b [formerly 2eb00233e833c805596310a628d40ea6515979a3] [formerly 40c7d1971e [formerly 2ce533f866]]
Former-commit-id: e55271e5d08793f99395b381ad0b5d1cf0cfaecd [formerly 40c7d1971e]
Former-commit-id: b970f9769c
|
2014-08-20 14:13:32 +00:00 |
|
Slav Korolev
|
e75e96158d
|
Issue #2875 - Implemented HFR Surface Current Velocity.
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761
This reverts commit fe4b0de79bdc9f7d9251320f16b6046314117f1f [formerly e5af41fa86] [formerly cf682f2787 [formerly f4eec5a328] [formerly 55a1120bdb] [formerly 55a1120bdb [formerly dd9d117f90]] [formerly cf682f2787 [formerly f4eec5a328] [formerly 55a1120bdb] [formerly 55a1120bdb [formerly dd9d117f90]] [formerly e5af41fa86 [formerly 55a1120bdb [formerly dd9d117f90] [formerly e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]]]]].
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: a9b64e0531 [formerly 7c336276f4] [formerly 1c896cedab] [formerly 1c896cedab [formerly a9bed4c6fd]] [formerly a9b64e0531 [formerly 7c336276f4] [formerly 1c896cedab] [formerly 1c896cedab [formerly a9bed4c6fd]] [formerly a779c786f1 [formerly 1c896cedab [formerly a9bed4c6fd] [formerly a779c786f1 [formerly aee044437492438381db98cc6fd3a917f6c05659]]]]]
Former-commit-id: a779c786f1
Former-commit-id: bcf0550d90 [formerly 14193d9f0d] [formerly d080af879e] [formerly d4b94ac51bd268016bf9d4cca48c43d9d55f4b07 [formerly 03e43cde864d9e501745b3af41e7db422c82dcbe] [formerly d080af879e [formerly 407be3d26f]]]
Former-commit-id: e04085e48440fe8779e5a601710717859a5d2138 [formerly 78f747829f22eb099862b93f26e70021a2f10294] [formerly 9d0e31155f [formerly 99a8258e86]]
Former-commit-id: 9d0e31155f
Former-commit-id: 255c2b2b9e
|
2014-08-19 10:12:36 -05:00 |
|
Richard Peter
|
61492ceed1
|
Merge "Issue #2875 - re-compile grib2.so with g2clib changes" into omaha_14.2.4
Former-commit-id: 183d5a8f56 [formerly d8de3c2d7a] [formerly 31ea5b534c] [formerly 31ea5b534c [formerly cae1c14c01]] [formerly 183d5a8f56 [formerly d8de3c2d7a] [formerly 31ea5b534c] [formerly 31ea5b534c [formerly cae1c14c01]] [formerly 65942275df [formerly 31ea5b534c [formerly cae1c14c01] [formerly 65942275df [formerly a9fef10a950d5f138088dce74b1709a25eb5cdfa]]]]]
Former-commit-id: 65942275df
Former-commit-id: baf9cae1ff [formerly 776b5ced5b] [formerly a5aee36fd2] [formerly 002fbd13a11880c00432317d3eb268e84094d3a2 [formerly 7b13dc2a7d1acac110020ab0316e670d945267bb] [formerly a5aee36fd2 [formerly 38f9f3a739]]]
Former-commit-id: 2935bb28e588d9bbd4f4357e64d2b1bfc3f420b8 [formerly 994a55f0fa41e5b89d4fab68321353faa8041d98] [formerly 09d3e23634 [formerly 1925c22c8c]]
Former-commit-id: 09d3e23634
Former-commit-id: ec922e8742
|
2014-08-19 08:58:23 -05:00 |
|
Nate Jensen
|
076afe9430
|
Merge "Issue #3497 refactored syntax check to prevent infinite loop possibility and apply some sanity" into omaha_14.2.4
Former-commit-id: 775486d1f1 [formerly bed1070749] [formerly 2ef19db3b7] [formerly 2ef19db3b7 [formerly f9036405d6]] [formerly 775486d1f1 [formerly bed1070749] [formerly 2ef19db3b7] [formerly 2ef19db3b7 [formerly f9036405d6]] [formerly 7c4a57e518 [formerly 2ef19db3b7 [formerly f9036405d6] [formerly 7c4a57e518 [formerly fe105be09b018efb625194f692ae9686a898981e]]]]]
Former-commit-id: 7c4a57e518
Former-commit-id: 46ca0ab137 [formerly 324d7fef97] [formerly 06881679ba] [formerly c05e130cc806a6c7c8ca170ddd91fb6f6d303ec4 [formerly 55f687ea863df8fd989ed866f405ab289588833f] [formerly 06881679ba [formerly 438bcc8d90]]]
Former-commit-id: a2b8fe9b6b84c442f3fd305acb1bddc1fdb46c2f [formerly 1922644539549669786a9658f7e36ecd98cf3019] [formerly 91ffebd905 [formerly 48b7c037e3]]
Former-commit-id: 604838dda85bbb140278701571c5413e4cedc154 [formerly 91ffebd905]
Former-commit-id: 7603661836
|
2014-08-19 08:37:47 -05:00 |
|
Nate Jensen
|
4e4d32747f
|
Merge "Issue #3500 added bundle loader synchronization" into omaha_14.2.4
Former-commit-id: ec403715aa [formerly 41639f767e] [formerly 178236b9c7] [formerly 178236b9c7 [formerly 15b7d9a39b]] [formerly ec403715aa [formerly 41639f767e] [formerly 178236b9c7] [formerly 178236b9c7 [formerly 15b7d9a39b]] [formerly f14b66d040 [formerly 178236b9c7 [formerly 15b7d9a39b] [formerly f14b66d040 [formerly 20431b0b036c3386f0f471887ebaeac5940463e4]]]]]
Former-commit-id: f14b66d040
Former-commit-id: a67c63a20b [formerly 7119d246b8] [formerly d0d0ecc38e] [formerly d0be242b7df569af943408eb1447b3ed805e28e2 [formerly 7b7cdb5a32c24003afeac5f915d3b04313573383] [formerly d0d0ecc38e [formerly b6d5713123]]]
Former-commit-id: 8c9f69055e190c19b4cd3b3a65528860f41c3de7 [formerly 27e10f744e1a5c9b5cf026114507cb1fb830f8a0] [formerly 9d79e2ae12 [formerly 047220f290]]
Former-commit-id: 9d79e2ae12
Former-commit-id: 7cda65b7fd
|
2014-08-19 08:37:35 -05:00 |
|
Steve Harris
|
bd324b140c
|
Issue #2875 - re-compile grib2.so with g2clib changes
This reverts commit b7e05d94f9a8d00d081605a63fbe96f098aa35cd [formerly fab7989b69] [formerly d299cfb3c7 [formerly 42418f76de] [formerly 68d2d83309] [formerly 68d2d83309 [formerly 2c7e22f825]] [formerly d299cfb3c7 [formerly 42418f76de] [formerly 68d2d83309] [formerly 68d2d83309 [formerly 2c7e22f825]] [formerly fab7989b69 [formerly 68d2d83309 [formerly 2c7e22f825] [formerly fab7989b69 [formerly 96094af605a2a303d440f009b25dd9740194a5ca]]]]]].
Former-commit-id: 6ffd03c308 [formerly cd7b8ccb74] [formerly 7fa6315202] [formerly 7fa6315202 [formerly 5f6a29c515]] [formerly 6ffd03c308 [formerly cd7b8ccb74] [formerly 7fa6315202] [formerly 7fa6315202 [formerly 5f6a29c515]] [formerly cddc961f2c [formerly 7fa6315202 [formerly 5f6a29c515] [formerly cddc961f2c [formerly 2b1665a1d9a1314bb6b0012161a6409ca2e6ebf8]]]]]
Former-commit-id: cddc961f2c
Former-commit-id: cf5496ace1 [formerly d06ac748a8] [formerly eeb928761d] [formerly b17b51718d98589fce571713e1ac8501b03348ef [formerly a482ba4bffd956c79173823968070a3f3199b4bb] [formerly eeb928761d [formerly 2ce04bce32]]]
Former-commit-id: 6bb028fcad45183ceb14b3f4beda8e20168f1db5 [formerly 464103bd5da4a2cff39bca8dce7028cda3d70a26] [formerly e55cb7c48e [formerly 41f4647d48]]
Former-commit-id: 802fa62b3844ba97a9a9832d4599da5e56af8528 [formerly e55cb7c48e]
Former-commit-id: c428a1c7d7
|
2014-08-19 08:18:11 -05:00 |
|
Brian.Dyke
|
0a728ed0b2
|
VLab Issue #3617 - DCS_266 Ingest & Display HRRR - LevelMappingFile.xml
Former-commit-id: 2d0c1ffd45 [formerly 52a47dc75e] [formerly 0c10dc2ee0] [formerly 0c10dc2ee0 [formerly f52f2b1c25]] [formerly 2d0c1ffd45 [formerly 52a47dc75e] [formerly 0c10dc2ee0] [formerly 0c10dc2ee0 [formerly f52f2b1c25]] [formerly aa6e025b14 [formerly 0c10dc2ee0 [formerly f52f2b1c25] [formerly aa6e025b14 [formerly 93c1663761e65e870262bc4fdf4028b08e20c85a]]]]]
Former-commit-id: aa6e025b14
Former-commit-id: 085facb995 [formerly fcd4547980] [formerly 331cb68011] [formerly 613b54ba9e22d64c5edfc7ff4c7b87f94a44eab6 [formerly a07800fc1b67b4770818ec101baec2aa41e12fbd] [formerly 331cb68011 [formerly 02e1b34afb]]]
Former-commit-id: 7e019b7be2777896c0edfe68af7d6f0e3d8cf9c1 [formerly 229fabb52fb449b33231402cc98cd6beefb21214] [formerly 5f3b50a3c9 [formerly 19fa7abdc0]]
Former-commit-id: 62485816ec731fb0479776ddd98d16a1de98177d [formerly 5f3b50a3c9]
Former-commit-id: ecc4712f43
|
2014-08-18 14:18:05 -04:00 |
|
Brian.Dyke
|
649827078b
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 0bea5c7396 [formerly a16d1d02b2] [formerly 3bba82c371] [formerly 3bba82c371 [formerly ef9ddd0f98]] [formerly 0bea5c7396 [formerly a16d1d02b2] [formerly 3bba82c371] [formerly 3bba82c371 [formerly ef9ddd0f98]] [formerly ca564e58ea [formerly 3bba82c371 [formerly ef9ddd0f98] [formerly ca564e58ea [formerly 3c1db35ef591bfe9c5124ad9c4c801d6acbdb8f8]]]]]
Former-commit-id: ca564e58ea
Former-commit-id: 2545a197d4 [formerly 80c87e2099] [formerly 41e9db65a4] [formerly a12806831825c7ba15ed03b37ac808ea6986f8e2 [formerly 5fdd8c6486b464aa09e1bf1061a42e0e2f3ef89d] [formerly 41e9db65a4 [formerly 5676e51dc3]]]
Former-commit-id: 3338fc41241803fe7429de1428ece62fc1337ec6 [formerly f674a739a1e297417ad2d7cac6479ae5d05be44e] [formerly fede3b4eb2 [formerly 012ed15b36]]
Former-commit-id: fede3b4eb2
Former-commit-id: 4149ddb527
|
2014-08-18 13:17:13 -04:00 |
|
Brian.Dyke
|
a158f2c1ba
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 7008a8e65b [formerly 867b82ca10] [formerly 2054d6f844] [formerly 2054d6f844 [formerly 9a212410b5]] [formerly 7008a8e65b [formerly 867b82ca10] [formerly 2054d6f844] [formerly 2054d6f844 [formerly 9a212410b5]] [formerly d82d58d38e [formerly 2054d6f844 [formerly 9a212410b5] [formerly d82d58d38e [formerly 5c9880c3179bf376798bb5658aec3666bddd7d3e]]]]]
Former-commit-id: d82d58d38e
Former-commit-id: 5ea1c8e527 [formerly 1d75000b56] [formerly 1d297de174] [formerly 82cb4fe006f37498758f9f6464f09861fab23aa6 [formerly a54b0882b92b48538ae981eea35265d473f09d9b] [formerly 1d297de174 [formerly 9b1b39f3be]]]
Former-commit-id: da366ed1b19f9e24d035a4d9bb6077bd71c55e54 [formerly 417d137abb4a91e7c87dcbe3b13c48447942570e] [formerly 3e914c01fc [formerly d96b05a86e]]
Former-commit-id: 3e914c01fc
Former-commit-id: 7788eed97a
|
2014-08-18 11:47:38 -04:00 |
|
Brian.Dyke
|
7b1411d4e1
|
Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: f7f1bbb8e5 [formerly 367d7d8840] [formerly f33e622e9d] [formerly f33e622e9d [formerly 0bdacc25f6]] [formerly f7f1bbb8e5 [formerly 367d7d8840] [formerly f33e622e9d] [formerly f33e622e9d [formerly 0bdacc25f6]] [formerly 4d47e00887 [formerly f33e622e9d [formerly 0bdacc25f6] [formerly 4d47e00887 [formerly 7a7e030bd70bb5bfee849750f1a8e1e4238ec0ee]]]]]
Former-commit-id: 4d47e00887
Former-commit-id: 4ece715aca [formerly 47bc7e5ce6] [formerly c6346336c0] [formerly 49ac7b7537c98217ed925462d944103904f58300 [formerly 8e22f77ad55445d0bb785ef4977c37c2470e3b70] [formerly c6346336c0 [formerly 0e7c221bd7]]]
Former-commit-id: 72f4c3fde606e8c21da2bd5a1e40b324c556380e [formerly 5a997c3f6791e0d44cb26c7094da3e60e3b7a9ba] [formerly 5a7a28d562 [formerly db0bc6ba12]]
Former-commit-id: 5a7a28d562
Former-commit-id: fac7d16bdc
|
2014-08-18 10:20:49 -04:00 |
|
Melissa Porricel
|
cf2c219c5e
|
ASM #15699 - Fix Grib decoder error
Change-Id: Ieabe763de544960f6e7bae0e2cf940eaa2493511
Former-commit-id: ce6cd9c25b [formerly c05a460f4d] [formerly 9f20c63f97] [formerly 9f20c63f97 [formerly 67e44f145a]] [formerly ce6cd9c25b [formerly c05a460f4d] [formerly 9f20c63f97] [formerly 9f20c63f97 [formerly 67e44f145a]] [formerly 7e78946ee0 [formerly 9f20c63f97 [formerly 67e44f145a] [formerly 7e78946ee0 [formerly e8c156d166cedc1553f9ffd8867633651443872d]]]]]
Former-commit-id: 7e78946ee0
Former-commit-id: 7a950c79d3 [formerly 3c6f76fb9c] [formerly 248205a78f] [formerly a9f764dd8598f3648785b89f3e868337e9520489 [formerly 1930a2fc1f1c8aafdfcb95816ecd28c123cb29d0] [formerly 248205a78f [formerly 356d0e04f6]]]
Former-commit-id: 834e958d31590b36d089fca8fc3ea3f44ebd30f5 [formerly a314482631a0d94beb986b6e22289cc4b34630f4] [formerly 9404c0b585 [formerly e76123c79a]]
Former-commit-id: 9404c0b585
Former-commit-id: c0165fe2f3
|
2014-08-15 13:41:53 -04:00 |
|
Zihou Wang
|
49981a9531
|
VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce
Former-commit-id: b801f91a61 [formerly d71def2617] [formerly 2fd6278cf3] [formerly 2fd6278cf3 [formerly e9f78d8f52]] [formerly b801f91a61 [formerly d71def2617] [formerly 2fd6278cf3] [formerly 2fd6278cf3 [formerly e9f78d8f52]] [formerly f54da5f6ae [formerly 2fd6278cf3 [formerly e9f78d8f52] [formerly f54da5f6ae [formerly f61e935c0372ee19768f2080da1f8fa21fb9aeb1]]]]]
Former-commit-id: f54da5f6ae
Former-commit-id: 91b79ab25f [formerly d88eba846f] [formerly cac176920d] [formerly 561be7eb03bdc6787c201ff85be399930cb6ddb4 [formerly 8e188c48a6b64c228ad8f7ee3d55a6814a9e87a5] [formerly cac176920d [formerly 065f2d9996]]]
Former-commit-id: ad9fbcfb89c2d69acc41ba709aff86218f9f493a [formerly 27642fe140d1a84db5df0745cc1a89b25dfda084] [formerly e222fa4eda [formerly 11e5523112]]
Former-commit-id: e222fa4eda
Former-commit-id: a6e7bd5fae
|
2014-08-15 11:04:39 -05:00 |
|
Ana Rivera
|
9cbb3aebe0
|
VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Conflicts:
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: c8feca05c5 [formerly 2f13aed851] [formerly 11073fdece] [formerly 11073fdece [formerly 9ada9356c5]] [formerly c8feca05c5 [formerly 2f13aed851] [formerly 11073fdece] [formerly 11073fdece [formerly 9ada9356c5]] [formerly 4c585af933 [formerly 11073fdece [formerly 9ada9356c5] [formerly 4c585af933 [formerly 7fa5b7a34613e88a77e4b32c79c6d8c3c6166ba2]]]]]
Former-commit-id: 4c585af933
Former-commit-id: 5d50637fb1 [formerly 1c9c634cbd] [formerly 706336e633] [formerly ac5aab7430ebbb5afc06834a627670c505fe230d [formerly 0a133cea945d17da6363d9f19082865a41af0dc3] [formerly 706336e633 [formerly b5e6172652]]]
Former-commit-id: 2235627ce0c998013d079fc8ec7be679a5be7e7a [formerly 8c09880e14992eb3d51f00d57659cc59ea79b21d] [formerly 15b766c9f5 [formerly 80a0799f46]]
Former-commit-id: ed4390bf6591957a1ae66956019fe23ded820980 [formerly 15b766c9f5]
Former-commit-id: eff21cac5d
|
2014-08-15 11:04:23 -05:00 |
|
Stephen Gilbert
|
9e2345df8e
|
VLab Issue #3648 - Corrected NCEP additions for ESTOFS model
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
Former-commit-id: 4085f94ea2 [formerly 85fc4aafa4] [formerly 84c3e1ed26] [formerly 84c3e1ed26 [formerly f6225b8969]] [formerly 4085f94ea2 [formerly 85fc4aafa4] [formerly 84c3e1ed26] [formerly 84c3e1ed26 [formerly f6225b8969]] [formerly 77fa357a15 [formerly 84c3e1ed26 [formerly f6225b8969] [formerly 77fa357a15 [formerly aef15e75c53666aa65dd4687725e9dbd8e6122e0]]]]]
Former-commit-id: 77fa357a15
Former-commit-id: 69ed846318 [formerly 9434ca39d0] [formerly b20d517e3f] [formerly f98ead4803f83f12a9a4dbebdd5bb3077f65b4aa [formerly 4bfb9df77719e9689855f02640e44cbd75a3c39f] [formerly b20d517e3f [formerly 333f24b12f]]]
Former-commit-id: 51d0d14ac8b6cfe788db574cc11dab2da1761baa [formerly 39f58876cf84e4bb435fb9af3c25cd9b9ead6aea] [formerly 8f046bbe63 [formerly 33743421ee]]
Former-commit-id: 8f046bbe63
Former-commit-id: 2b08c83c4f
|
2014-08-15 11:03:48 -05:00 |
|
Fay.Liang
|
3544bbd5d1
|
ASM #600 - the fixes for DR 17380
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
Former-commit-id: 5e6874ceb2 [formerly 802de9c08f] [formerly c2dd7c183f] [formerly c2dd7c183f [formerly f5901b8ede]] [formerly 5e6874ceb2 [formerly 802de9c08f] [formerly c2dd7c183f] [formerly c2dd7c183f [formerly f5901b8ede]] [formerly 77a6ab632f [formerly c2dd7c183f [formerly f5901b8ede] [formerly 77a6ab632f [formerly 89c29c1228830d301b7046ebb7d4281666c2b768]]]]]
Former-commit-id: 77a6ab632f
Former-commit-id: b53202f3ab [formerly 37ec192e67] [formerly 6565ac4583] [formerly 853519d3e1f2f9299a761dc5f6445081f3fd21c1 [formerly 0a615ced75ecf5224f9180ecde97c439e0e7ce71] [formerly 6565ac4583 [formerly 8fb443033e]]]
Former-commit-id: 7a9a5f9eb7cf037dfb2b914bf84879f1f2ffef6a [formerly cc592d41f560ca4c1dc979b5205ecce8412244b2] [formerly 83fd6095fd [formerly 2520dede55]]
Former-commit-id: 83fd6095fd
Former-commit-id: c625388109
|
2014-08-15 11:03:15 -05:00 |
|
Ana Rivera
|
ad3bf12044
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: ae2aba0187 [formerly 0a812a313d] [formerly 1daa44291e] [formerly 1daa44291e [formerly a44d5d91db]] [formerly ae2aba0187 [formerly 0a812a313d] [formerly 1daa44291e] [formerly 1daa44291e [formerly a44d5d91db]] [formerly 9bf2df23be [formerly 1daa44291e [formerly a44d5d91db] [formerly 9bf2df23be [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]]]]]
Former-commit-id: 9bf2df23be
Former-commit-id: b01b55edc2 [formerly 6c6efd68c0] [formerly c294608c37] [formerly c8d3f62ecc65daf433269bbdb9ad8a3e36bbfa6e [formerly 0dfe16e83678d27d979861133a85a641c588b678] [formerly c294608c37 [formerly eefe73ee51]]]
Former-commit-id: 78463d00b30bd8ead1c7ca3fb9b22e43adfe4355 [formerly 35a0a95e45117d91938da4179d30084369566fbe] [formerly 0ff1ac5357 [formerly 4b42e52ce3]]
Former-commit-id: 0ff1ac5357
Former-commit-id: 27b8eeca07
|
2014-08-15 11:02:36 -05:00 |
|
David Friedman
|
1d96a6ad37
|
ASM #551 - EDEX can decode some METAR peak wind fields as 6 hour min/max temperature
Change-Id: I1bf62b197f65073dc26356e9eb67d32f7f8ee45c
Former-commit-id: ae302ac647 [formerly dbcabbfa1f] [formerly 5604904fc8] [formerly 5604904fc8 [formerly 913330902d]] [formerly ae302ac647 [formerly dbcabbfa1f] [formerly 5604904fc8] [formerly 5604904fc8 [formerly 913330902d]] [formerly 62f152ad70 [formerly 5604904fc8 [formerly 913330902d] [formerly 62f152ad70 [formerly b3947c58da51f964032e9539c010030c2cbe0731]]]]]
Former-commit-id: 62f152ad70
Former-commit-id: e16a9c9a4d [formerly 0de83ca5ae] [formerly 95d472a5ce] [formerly e358e0977875c0b45528ddbdafa6dead09d20c8f [formerly b74e503c971bd7397e0bdd9d6bc424dd11f67974] [formerly 95d472a5ce [formerly 85eae0a58c]]]
Former-commit-id: 0a0d60a2890cc5e2c41b6b7ddcd1a6c77bf0c79c [formerly 4b3bd1de85fa32a3f72f988ff6dcdcd1e8138857] [formerly eca651949b [formerly 282892e71d]]
Former-commit-id: eca651949b
Former-commit-id: a1955e4199
|
2014-08-15 11:01:42 -05:00 |
|
Qinglu.Lin
|
5735cdf869
|
ASM #515 - WarnGen product QC incorrectly reports UGC/area mismatch
Change-Id: I5ef8e83c826d3fb1d5ef72d5866f882d9c97e1f5
Former-commit-id: a51248941c [formerly dbb3a9f8b6] [formerly 8693097b0b] [formerly 8693097b0b [formerly 9a9e32dc53]] [formerly a51248941c [formerly dbb3a9f8b6] [formerly 8693097b0b] [formerly 8693097b0b [formerly 9a9e32dc53]] [formerly ff551ea143 [formerly 8693097b0b [formerly 9a9e32dc53] [formerly ff551ea143 [formerly bafc616881af28b5397c45c5155a3c812a9c048d]]]]]
Former-commit-id: ff551ea143
Former-commit-id: 17a9693cd0 [formerly e23921e2d7] [formerly d7cd89c6e1] [formerly ac81ff86410e765099cfb4cf517637630a67cffc [formerly a46abd8c7b123f8afce087ccd2bb33be91dfd37e] [formerly d7cd89c6e1 [formerly c1d6719956]]]
Former-commit-id: c4eb6431e4a5a4e757c08bf96e46d81adeb15891 [formerly 6d38a84a52ae8fb9d840177f56bcd4c7ad328f12] [formerly a596908646 [formerly 638aeb810e]]
Former-commit-id: a596908646
Former-commit-id: b4b4993b0e
|
2014-08-15 11:01:30 -05:00 |
|
Ana Rivera
|
1428958636
|
VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml
Former-commit-id: f6438c81a8 [formerly a258f0f812] [formerly cc354742e1] [formerly cc354742e1 [formerly a053fd5bad]] [formerly f6438c81a8 [formerly a258f0f812] [formerly cc354742e1] [formerly cc354742e1 [formerly a053fd5bad]] [formerly 95451b2959 [formerly cc354742e1 [formerly a053fd5bad] [formerly 95451b2959 [formerly d95450f2eebc6b3d10093bd16736b349a1d0b12b]]]]]
Former-commit-id: 95451b2959
Former-commit-id: a9c53c47a6 [formerly 43956e6672] [formerly dab9e1379a] [formerly 2f38daa411487134ba1170d9d89015758ac9eec7 [formerly 2a0c828593e8f04fdd99beedce530bd135147e45] [formerly dab9e1379a [formerly 236a089297]]]
Former-commit-id: 5b2bbe93f5689b84e64f329be19d2c50c71e7c2a [formerly d46e6a3eb9f2ec999b3f9830523a0ee32d68f61f] [formerly b626588fae [formerly c8556a8a43]]
Former-commit-id: b626588fae
Former-commit-id: 098d27d3f0
|
2014-08-15 11:01:23 -05:00 |
|
Kiran.Shrestha
|
2fa3c58a14
|
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I27aab39c7af355f660d873b1a17b7d94209fb13b
Former-commit-id: 923e95f815 [formerly 3b74de56a4] [formerly d307a6aa9c] [formerly d307a6aa9c [formerly e7173dd45a]] [formerly 923e95f815 [formerly 3b74de56a4] [formerly d307a6aa9c] [formerly d307a6aa9c [formerly e7173dd45a]] [formerly ca120a4106 [formerly d307a6aa9c [formerly e7173dd45a] [formerly ca120a4106 [formerly b83aef5ef55a58d9f267fd7a80184482d1e5d092]]]]]
Former-commit-id: ca120a4106
Former-commit-id: 267a483f02 [formerly 44340adc21] [formerly e0f6a03aa4] [formerly 104a306cf1fcb1fa2a798b7b137cd3119daf1895 [formerly 604d92e3999065b044579ff38e48ffcbebf6672b] [formerly e0f6a03aa4 [formerly 8686e58440]]]
Former-commit-id: ae941f534d6fded347f4e4826a1970cc21096dcc [formerly 6de73f9c686657375474a226803e85dd1be57aae] [formerly 33e417ad19 [formerly 31f31038ca]]
Former-commit-id: 33e417ad19
Former-commit-id: 3083e14c74
|
2014-08-15 11:00:19 -05:00 |
|
Loubna.Bousaidi
|
9590617601
|
ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: 26f28304ad [formerly 281f16d700] [formerly afae4700a6] [formerly afae4700a6 [formerly 8c15d1f124]] [formerly 26f28304ad [formerly 281f16d700] [formerly afae4700a6] [formerly afae4700a6 [formerly 8c15d1f124]] [formerly d41e489ced [formerly afae4700a6 [formerly 8c15d1f124] [formerly d41e489ced [formerly a43ad03838d53d3b9688b48851f41a1af6b043f6]]]]]
Former-commit-id: d41e489ced
Former-commit-id: 289439cc25 [formerly ea83b54df2] [formerly d9be7127bc] [formerly 6828187e17fd235e049cd17fba6e8aeb561e9f11 [formerly e79b024b72366d3a4c5251b13e7896757aff0e52] [formerly d9be7127bc [formerly 5cc9b08890]]]
Former-commit-id: 7668bfb275ad7a2ed7399341f20e6319e16b6f65 [formerly b4514916beb24de3adb110ccdeb429cb22202a70] [formerly af004872fd [formerly 65cfa4e033]]
Former-commit-id: af004872fd
Former-commit-id: 54c46422a5
|
2014-08-15 10:54:10 -05:00 |
|
Loubna.Bousaidi
|
2ed4b63fd9
|
ASM #578 apply gross range check to the adjusted value
Change-Id: Ia90bc10e6e1e1baa8f3842ade56d7551ca405e34
Conflicts:
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Former-commit-id: 71e112d686 [formerly 70b7c5cb00] [formerly 8038fc4a8d] [formerly 8038fc4a8d [formerly e109528caf]] [formerly 71e112d686 [formerly 70b7c5cb00] [formerly 8038fc4a8d] [formerly 8038fc4a8d [formerly e109528caf]] [formerly 213773cde4 [formerly 8038fc4a8d [formerly e109528caf] [formerly 213773cde4 [formerly d1d86dd82bfa114bf181de5cf993f2bed349ada5]]]]]
Former-commit-id: 213773cde4
Former-commit-id: 934be2594d [formerly 6441867344] [formerly 5c83a66633] [formerly afbace83d54c4f227d8ff56fb3629e005308d9e9 [formerly 47e86246c7c99c025c9fb58c74383ee0ca9fe3ad] [formerly 5c83a66633 [formerly 3c130d0007]]]
Former-commit-id: b433b2c5c759895c9e8cf4743bbd2435f0c1f249 [formerly 87c9012c08aa9dd9ce216e7f5d0e3ea7f73fda9e] [formerly d63ec2ac1c [formerly 7984a45084]]
Former-commit-id: d63ec2ac1c
Former-commit-id: fa14775f9c
|
2014-08-15 10:53:47 -05:00 |
|
Brian.Dyke
|
7e7a7638b4
|
Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 78e58406c1 [formerly a346d38358] [formerly a73c8d4cda] [formerly a73c8d4cda [formerly 8b1b457310]] [formerly 78e58406c1 [formerly a346d38358] [formerly a73c8d4cda] [formerly a73c8d4cda [formerly 8b1b457310]] [formerly d3888b16f3 [formerly a73c8d4cda [formerly 8b1b457310] [formerly d3888b16f3 [formerly bdfe1c263b8bcc0f6ebc8fd31c506e76271319ea]]]]]
Former-commit-id: d3888b16f3
Former-commit-id: c98cb9c5a6 [formerly eb41063d90] [formerly d0985451d7] [formerly bfd8d3e16e579d2b18bd40de43a581629b0dff2e [formerly fd68abe1b79e15942d5ec8b4ca3f245a8557b52f] [formerly d0985451d7 [formerly 89941d5ca9]]]
Former-commit-id: 0c0405b6c32bdd7abb82935336cce044421988d7 [formerly d8f41233bd6c920a624ad29b15b40ce0796a26c4] [formerly fbaf15c8f8 [formerly 627583a000]]
Former-commit-id: fbaf15c8f8
Former-commit-id: 3b65d74da7
|
2014-08-15 11:52:35 -04:00 |
|
Michael Gamazaychikov
|
241ff0cebb
|
ASM #15701 WarnGen displaying error for Watch Wording when switching from backup site to local site
Change-Id: I9ff834f0b3717d046f278b8a21ca955e5f5c4805
Former-commit-id: dede79833a [formerly d0c9d21538] [formerly 2b450af136] [formerly 2b450af136 [formerly 9897417235]] [formerly dede79833a [formerly d0c9d21538] [formerly 2b450af136] [formerly 2b450af136 [formerly 9897417235]] [formerly c14a5287ac [formerly 2b450af136 [formerly 9897417235] [formerly c14a5287ac [formerly 126ec43423a864df597bd6dd745671ee0bf4fbfb]]]]]
Former-commit-id: c14a5287ac
Former-commit-id: 639c91f083 [formerly 3050ad699d] [formerly ab21a0f8e9] [formerly 92f83f35d03fcad61de8bd674c726ca37a8e7765 [formerly 2fcf1110fa9581e169e37c41d84f20cc066eb8b5] [formerly ab21a0f8e9 [formerly 4097a7ddd0]]]
Former-commit-id: 91a8a1da6f4d85af73bd999eca4853ac93c3d989 [formerly 158147e009c43f9b7c0c8b9b3edd0709f3289054] [formerly 65daa0f117 [formerly 2115121def]]
Former-commit-id: 16fc11bce4006e95e6d2ad5347a79de7e47e362c [formerly 65daa0f117]
Former-commit-id: aa8278e995
|
2014-08-15 11:03:23 -04:00 |
|
Nate Jensen
|
57fa0c0490
|
Issue #3524 ensure apache httpclient always sends credentials with https
requests
Change-Id: Ia3fef0d2236167c8b48c0107848f7e8a925acc1c
Former-commit-id: c794dd6349 [formerly 4e99fa096a] [formerly 6907c5a1cf] [formerly 6907c5a1cf [formerly 5bcddf1af1]] [formerly c794dd6349 [formerly 4e99fa096a] [formerly 6907c5a1cf] [formerly 6907c5a1cf [formerly 5bcddf1af1]] [formerly 9ddde59743 [formerly 6907c5a1cf [formerly 5bcddf1af1] [formerly 9ddde59743 [formerly 843a3b51f2fd90275149d0d814f280ed64247a2c]]]]]
Former-commit-id: 9ddde59743
Former-commit-id: 3e41daa443 [formerly 74c550cb5b] [formerly 4b114ba79b] [formerly 9849b27aaa4dcd64b4958a23f576e04746f171ff [formerly 79c6b932ea0c1933106ec6ae9e32cdc0bc1d3cef] [formerly 4b114ba79b [formerly 97109d5864]]]
Former-commit-id: 05a3f7d1f70c886d64a0e796302c6264d6908c66 [formerly 5f8d7419269741a808cc8301aed4d148d69b3f38] [formerly 346a3c5ed8 [formerly 00b327043c]]
Former-commit-id: 346a3c5ed8
Former-commit-id: 7bdfb0354f
|
2014-08-15 09:15:11 -05:00 |
|
Brian Clements
|
5c8549e8c8
|
Issue #3500 added bundle loader synchronization
Change-Id: Ia230f14c0fc3d5d3d2fa0cd691cd12e392f93dba
Former-commit-id: 2ddfd630f4 [formerly ab79341fd5] [formerly d03319b1e2] [formerly d03319b1e2 [formerly e228e31243]] [formerly 2ddfd630f4 [formerly ab79341fd5] [formerly d03319b1e2] [formerly d03319b1e2 [formerly e228e31243]] [formerly 6789b2e097 [formerly d03319b1e2 [formerly e228e31243] [formerly 6789b2e097 [formerly 01db1619f52f110072e0820047b7205873683135]]]]]
Former-commit-id: 6789b2e097
Former-commit-id: 1bf5413979 [formerly a3f3bf10f5] [formerly 934a645920] [formerly 1fbcaba65b64b763d01ff63b2b4dc7a2e160ee23 [formerly 44ab770bb885d4a8592af7c5706115a9c485ad6a] [formerly 934a645920 [formerly 7858f84fcb]]]
Former-commit-id: 4d514dc71bf841cf56d1a1cb3f95638feea19d47 [formerly 33b5b1c34707ed94b969e1197923090eda73d92b] [formerly f80b63a0af [formerly 9274a9a5a8]]
Former-commit-id: 49a2b33ccb61cba20e4f87452a14553a0fae8120 [formerly f80b63a0af]
Former-commit-id: 869d0cbf02
|
2014-08-14 11:02:37 -05:00 |
|
Nate Jensen
|
3ca4f0fd1f
|
Issue #3497 refactored syntax check to prevent infinite loop possibility
and apply some sanity
Change-Id: I8118a99729c75fc756313db13654f34087a1e648
Former-commit-id: 843958d2fa [formerly 177d7cffce] [formerly e9ad8ac975] [formerly e9ad8ac975 [formerly 026df22018]] [formerly 843958d2fa [formerly 177d7cffce] [formerly e9ad8ac975] [formerly e9ad8ac975 [formerly 026df22018]] [formerly 389ae22829 [formerly e9ad8ac975 [formerly 026df22018] [formerly 389ae22829 [formerly b080e8ef12dc3223b1676b97bc153f9422657514]]]]]
Former-commit-id: 389ae22829
Former-commit-id: 55b349dc4c [formerly 999a1f19df] [formerly 339f8ef0e3] [formerly 801582e7aed58fd58012d585996f92a87a2c2a69 [formerly fa346bc0651c11ea01ffcb4ee89ace60ddcd7794] [formerly 339f8ef0e3 [formerly cff90cfe7e]]]
Former-commit-id: 15b56493013b08fb184e0280768d7a4c6ef6046e [formerly 9563cc7c6269497dc1f3a7409100f287001c9ec1] [formerly 4e70a557fc [formerly 7c12ec9b4b]]
Former-commit-id: 4e70a557fc
Former-commit-id: 8130878a82
|
2014-08-13 16:13:31 -05:00 |
|
Steve Harris
|
11ebf367a1
|
Merge branch 'master_14.2.2' (14.2.2-26) into omaha_14.2.2
Former-commit-id: 92654ef4a1 [formerly 5c3f6ea126] [formerly f23139ba39] [formerly f23139ba39 [formerly 1839d53d2c]] [formerly 92654ef4a1 [formerly 5c3f6ea126] [formerly f23139ba39] [formerly f23139ba39 [formerly 1839d53d2c]] [formerly b4ac2e9c2c [formerly f23139ba39 [formerly 1839d53d2c] [formerly b4ac2e9c2c [formerly c5d804b092e56082337b80f717c6b2f3307fd9be]]]]]
Former-commit-id: b4ac2e9c2c
Former-commit-id: 866059d27e [formerly 8ab54a71ef] [formerly 75963915c4] [formerly b0f94300a9f52b62f5972df64fe2d5dd92a4b508 [formerly fced3f02daea425f43df2e7bc4be39ba68485434] [formerly 75963915c4 [formerly b2e8abd924]]]
Former-commit-id: 4152be6505a1dbe615e2af1ced48c38187b6f669 [formerly dee2525bf0b65a766a6cca9676ec59686b1747c8] [formerly 564c6e20ea [formerly 68f238ea5b]]
Former-commit-id: 564c6e20ea
Former-commit-id: 86b2bbc69c
|
2014-08-13 14:50:49 -05:00 |
|