Commit graph

5912 commits

Author SHA1 Message Date
Matthew Howard
7116cc0587 Merge "ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button" into asm_14.3.1
Former-commit-id: 754bfbf637 [formerly 00e44aada9] [formerly 95b9746871] [formerly 754bfbf637 [formerly 00e44aada9] [formerly 95b9746871] [formerly e17f8a0082 [formerly 95b9746871 [formerly 5893d06b990cec295338595b006a45bb762b4b73]]]]
Former-commit-id: e17f8a0082
Former-commit-id: 8293641589 [formerly 56a231e0b0] [formerly 6a676edc412c070c434ea840b98a7a7076bcdcbb [formerly 725fff1b13]]
Former-commit-id: 3a2cf3bcd0aab7204869f124b96a1e7f58ad1946 [formerly eb700ea256]
Former-commit-id: bcae526dc8
2014-05-22 07:50:50 -05:00
Michael Gamazaychikov
a8672786bf ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85

Former-commit-id: b3d76892d1 [formerly 8ae5d535de] [formerly 63409ef272] [formerly b3d76892d1 [formerly 8ae5d535de] [formerly 63409ef272] [formerly 5bff9f2ac8 [formerly 63409ef272 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]]]
Former-commit-id: 5bff9f2ac8
Former-commit-id: b499ee2828 [formerly 0d38d04dad] [formerly 3f60fc9aefaa49ce841bebfd87ef42af677038af [formerly 134f486069]]
Former-commit-id: de7589ac82c2fe4ab8fce61c3a0e6a30b30502d2 [formerly 55d44735ef]
Former-commit-id: 0217549622
2014-05-21 15:12:08 +01:00
Zhidong.Hao
8cee28ddb7 ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button
Change-Id: I764436168339ce46ab01b27c9078455e6a543176

Former-commit-id: 2f48f5cbcd [formerly 2773af6884] [formerly bcdb0dba95] [formerly 2f48f5cbcd [formerly 2773af6884] [formerly bcdb0dba95] [formerly 77ac5458d0 [formerly bcdb0dba95 [formerly d4be1e866c561717a9a7697b3ff451efdd184fe6]]]]
Former-commit-id: 77ac5458d0
Former-commit-id: fc73606c29 [formerly b529afd928] [formerly d604834b7d13012caf6a5bbf00b9a7d059116ca1 [formerly a65061a58f]]
Former-commit-id: cc55de7a2ab8632f4b30d3d7fb2aa159a579870a [formerly 17a525443c]
Former-commit-id: 1b25474707
2014-05-21 09:15:41 -04:00
Brian.Dyke
4671c25ea4 Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java

Former-commit-id: 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly db68b80bbd [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]]
Former-commit-id: db68b80bbd
Former-commit-id: 5a07e9c984 [formerly 937b9bb9ce] [formerly 6fbbfc0267046011d5fd8ba4c15aa6b2ab182188 [formerly ebcaebb28d]]
Former-commit-id: 6e138f1746a6c0aa092e3c298cd91ece951e39d3 [formerly f42d40c3a3]
Former-commit-id: b0b377e811
2014-05-20 14:35:34 -04:00
Ron Anderson
6fa737a051 Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465

Former-commit-id: 0e02e83629 [formerly b794dd04e1] [formerly 3b404f4083] [formerly 0e02e83629 [formerly b794dd04e1] [formerly 3b404f4083] [formerly 809548b283 [formerly 3b404f4083 [formerly b10be8ae235c4528c4ce83088daeccf8a0928933]]]]
Former-commit-id: 809548b283
Former-commit-id: f80e9822d5 [formerly fd6e80dd27] [formerly c78c2ff04c4d5c9559341c2f0e958d54366110f4 [formerly 029201d4b9]]
Former-commit-id: cd13fa3b4f04702ca8feffa0cdc0dff76b7311b3 [formerly 3f20fc86df]
Former-commit-id: 31da20ef5b
2014-05-20 11:10:26 -05:00
Brian.Dyke
8ad7621cbc Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
Former-commit-id: 9426ddb9a9 [formerly 88a5ecefaa] [formerly e5f951bf89] [formerly 9426ddb9a9 [formerly 88a5ecefaa] [formerly e5f951bf89] [formerly 8c2cccb930 [formerly e5f951bf89 [formerly d9c230fbd50cc5acf1dd5c7c5e775f337de41921]]]]
Former-commit-id: 8c2cccb930
Former-commit-id: 7b6988aa0b [formerly bb2089f2df] [formerly a2965f6fcb55c7bf469752a36f14c13683c6f1bd [formerly 89d2843610]]
Former-commit-id: fbb79af68eeeaa91cfaddc4aea1e0b429540ecca [formerly fe658cb381]
Former-commit-id: 774897735a
2014-05-20 12:08:29 -04:00
Brian.Dyke
2eca58ce8d CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: c9ef80beeb [formerly 8435ace4f8] [formerly 545e7f6ce9] [formerly c9ef80beeb [formerly 8435ace4f8] [formerly 545e7f6ce9] [formerly abf0f995cd [formerly 545e7f6ce9 [formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]]]]
Former-commit-id: abf0f995cd
Former-commit-id: 1f0f7de4c5 [formerly 9af8951a2a] [formerly af49ed0701c5a48e77ad4fbbb9da056ebd4f6592 [formerly fa13621d8e]]
Former-commit-id: 9310164288d45c3f9652b0aabd8948d3ef0e220c [formerly 0f5964b03f]
Former-commit-id: 5d6603320b
2014-05-20 11:56:30 -04:00
Brian.Dyke
be5e377068 Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
Former-commit-id: 432e5f15a5 [formerly c4b7b8dd74] [formerly dbd3bb54e8] [formerly 432e5f15a5 [formerly c4b7b8dd74] [formerly dbd3bb54e8] [formerly d5a4669fc4 [formerly dbd3bb54e8 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]]]
Former-commit-id: d5a4669fc4
Former-commit-id: f113398a16 [formerly f2885c9996] [formerly 9eb0d56ad4743d868045273e945e80f0d2e0674f [formerly f30bd7d9ae]]
Former-commit-id: b203c0e47900941c64b4992284bdc8701c374b29 [formerly 39d8bd9004]
Former-commit-id: 3d35be33cb
2014-05-19 14:07:04 -04:00
Richard Peter
9e8e1f32e0 Issue #2726: Fix route start up order race condition
Change-Id: I3461f3e7c79ba099eb6c3eafa5b0345aa0fbf585

Former-commit-id: 27f56c3f36 [formerly 74f1c41e68] [formerly 17b07813ba] [formerly 27f56c3f36 [formerly 74f1c41e68] [formerly 17b07813ba] [formerly 974303044a [formerly 17b07813ba [formerly 802f537f26d88d43811df7c97382f6082f79a391]]]]
Former-commit-id: 974303044a
Former-commit-id: 1632ebe79a [formerly 696cf7e8c6] [formerly 5a3f00e4820d1a74b05a13ab9604132f4144739a [formerly 8d3e897cb5]]
Former-commit-id: 3a0cc496027f4063969d0f3b0b1ba27e0a5293ac [formerly 77b7ad1a7e]
Former-commit-id: f56a989679
2014-05-19 12:43:56 -05:00
Brian.Dyke
be2b29e0f3 CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: 75f7d77c45 [formerly 2eae2be646] [formerly b29db01a59] [formerly 75f7d77c45 [formerly 2eae2be646] [formerly b29db01a59] [formerly 06c2478539 [formerly b29db01a59 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]]]
Former-commit-id: 06c2478539
Former-commit-id: 534d211494 [formerly 3558d8f162] [formerly 8d732a149cd7483006dfc9f0e4e9c03c2adcc03f [formerly 9baa09f4bc]]
Former-commit-id: 976e0f4a32e004b04954001cee7a9831fc35972a [formerly c88e8d41b6]
Former-commit-id: b65a3a3214
2014-05-19 13:26:45 -04:00
Shawn Hooper
14897ec277 Merge "Revert "ASM #512 - Need radar data watchdog functionality"" into asm_14.3.1
Former-commit-id: 30173aa114 [formerly 476c78a2d7] [formerly 189e3cc1f2] [formerly 30173aa114 [formerly 476c78a2d7] [formerly 189e3cc1f2] [formerly 342398e6a3 [formerly 189e3cc1f2 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]]]
Former-commit-id: 342398e6a3
Former-commit-id: b4b991322e [formerly 32ca0c8d1c] [formerly 55bb52b54a8cf33569c277bc952a25ecfc9e874a [formerly 5a8f0dbd69]]
Former-commit-id: e74ea76f24f56239ad0308729a918fbc350481a3 [formerly 3ea1e218e7]
Former-commit-id: 9edb54c13a
2014-05-19 12:18:46 -05:00
Shawn Hooper
6e9bc30bd9 Revert "ASM #512 - Need radar data watchdog functionality"
This reverts commit e4559309601c5d4a3096c42cd56f1d3167c0fd0e [formerly 7e036b2bbc] [formerly d74a7c5460 [formerly 0c8c5ef728] [formerly 9988804887] [formerly d74a7c5460 [formerly 0c8c5ef728] [formerly 9988804887] [formerly 7e036b2bbc [formerly 9988804887 [formerly ad727f0b3d820cf2310b4b8cc67639b6d141af6b]]]]].

Change-Id: I730af948f1d0cfcf2167524ea934ffc8a57ece87

Former-commit-id: 3f8ffcfaaf [formerly 28660769ec] [formerly 4a4ca91f69] [formerly 3f8ffcfaaf [formerly 28660769ec] [formerly 4a4ca91f69] [formerly 20541c39ca [formerly 4a4ca91f69 [formerly 75d287edfc717bb0d085a9723c417edbce035237]]]]
Former-commit-id: 20541c39ca
Former-commit-id: c476d35ad0 [formerly 00df339111] [formerly 7dfc0f06c329a98b4286a805a3ca1777ca0e8d0a [formerly beb73c09f3]]
Former-commit-id: 070415e0e6752b7856197bfa124dcbeb07aecf9c [formerly e6e4ba572d]
Former-commit-id: 06f37867ea
2014-05-19 11:27:43 -05:00
Gang.Zhang
f029bd627d ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac

Former-commit-id: 98e50ae694 [formerly 6e034005e0] [formerly 94fea6748f] [formerly 98e50ae694 [formerly 6e034005e0] [formerly 94fea6748f] [formerly 9c1587b92d [formerly 94fea6748f [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]]]]
Former-commit-id: 9c1587b92d
Former-commit-id: 03dfdaffd4 [formerly ec6053c3f7] [formerly cf5b27d037d8ebdd2e427efe07f404e425a82240 [formerly baa1546e39]]
Former-commit-id: b3045b8c7359818619329a1fdacbf426709f3318 [formerly b82d8bf6fb]
Former-commit-id: 7cd2402325
2014-05-19 15:40:41 +01:00
brian.dyke
5c9495ee04 Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]]
Former-commit-id: 58683ad040
Former-commit-id: a2add51880 [formerly 2e105c1d5d] [formerly cba44a8343721392c8a010e859fb1efaca4b604b [formerly bc4649765a]]
Former-commit-id: 161c7365002f1434a02f072bc8ba71aba3cbf346 [formerly b42011fc76]
Former-commit-id: b2e3c50ec0
2014-05-19 09:45:37 -04:00
Brian.Dyke
0545cfd2f6 CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: a9f2fdb086 [formerly 509616ba6a] [formerly f8ed9c7944] [formerly a9f2fdb086 [formerly 509616ba6a] [formerly f8ed9c7944] [formerly e9bd17a21f [formerly f8ed9c7944 [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]]]
Former-commit-id: e9bd17a21f
Former-commit-id: 3772c8d2bf [formerly e563eb3376] [formerly d77fe7357769ccd29689730a70de23400e90fee7 [formerly 409a48b907]]
Former-commit-id: ffcdc5842385a946631a64cb44a2f992361237b3 [formerly acf4cbbd78]
Former-commit-id: eefa4dbf96
2014-05-19 07:55:42 -04:00
David Friedman
cdd250c2df Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
Former-commit-id: 99edfe0a17 [formerly a920c5a5e4] [formerly c909746e0e] [formerly 99edfe0a17 [formerly a920c5a5e4] [formerly c909746e0e] [formerly a55e851780 [formerly c909746e0e [formerly a4c1c5524c31384c3532076ee151fd9a294367d2]]]]
Former-commit-id: a55e851780
Former-commit-id: 57712d2038 [formerly f8c9026f79] [formerly bee35b0f50c15c2acee4d04f32450273a1e35f20 [formerly 101f43d875]]
Former-commit-id: 8add7e0f674985ab73fd82e03a1a771477439c2f [formerly 421d4a56c8]
Former-commit-id: f999df6859
2014-05-16 16:40:38 -05:00
David Friedman
e4ec928222 ASM #240 - RPS lists delivered by awips2-rcm out of date
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb

Former-commit-id: a13190aeb9 [formerly b462660d75] [formerly caa38ec709] [formerly a13190aeb9 [formerly b462660d75] [formerly caa38ec709] [formerly eab9a6b6d7 [formerly caa38ec709 [formerly 880c5d7259a5af17f2452fa3bd9f18d852c81d82]]]]
Former-commit-id: eab9a6b6d7
Former-commit-id: d06f8def65 [formerly 81abf8e7d9] [formerly 5fa6cc8307089b8f052ac6ad0cfa79f0362dc0ab [formerly 4efaa47d2d]]
Former-commit-id: 80202f6447063c949a9a1aa3353a7e14f3d4094a [formerly e576ddde57]
Former-commit-id: fa63aea622
2014-05-16 21:38:34 +00:00
David Friedman
3ea4f1dc1b ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5

Former-commit-id: 39e412aac8 [formerly 404f3af49e] [formerly 1503bc4162] [formerly 39e412aac8 [formerly 404f3af49e] [formerly 1503bc4162] [formerly 3b69a240c8 [formerly 1503bc4162 [formerly 4fd6bbfba29a39bf125269ab8342b826995e3d86]]]]
Former-commit-id: 3b69a240c8
Former-commit-id: 3a6e887a7c [formerly ff0f8e731f] [formerly ab442fed2bdf78f10c432839c809a8791bac6aed [formerly b62ac936ba]]
Former-commit-id: 21090d6cbb605d49bb525d9b72ed9817b4fb6d94 [formerly f8e5e96774]
Former-commit-id: 32524f8d3c
2014-05-16 21:34:59 +00:00
Brian.Dyke
40f8656824 Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
Former-commit-id: 99e1c53457 [formerly c2afc26206] [formerly 3183283e99] [formerly 99e1c53457 [formerly c2afc26206] [formerly 3183283e99] [formerly dcd238c6a3 [formerly 3183283e99 [formerly 18486e2e8ead4614c05e3a7775cba95cd78053c8]]]]
Former-commit-id: dcd238c6a3
Former-commit-id: fb776b4091 [formerly 4a37cd32bd] [formerly ec4e89f93aee5394b38539a722d1331582a6eb6f [formerly 353aebe447]]
Former-commit-id: bb99efa86111dcde4e9407416c5902c94eb89fed [formerly 3b7e8c2c66]
Former-commit-id: 529febf986
2014-05-16 08:45:47 -04:00
Stephen Gilbert
fff3809e18 VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
Updates to various resource plugins such as ncgrid, plotdata, ncscat,
and ntrans

Change-Id: Ie04200519fad583d2b252ea161cb5c72eb90732c

Former-commit-id: f68dd77088 [formerly 5885bff027] [formerly 57cf6c4bd7] [formerly f68dd77088 [formerly 5885bff027] [formerly 57cf6c4bd7] [formerly e1b0c5f102 [formerly 57cf6c4bd7 [formerly 0832f7cdc3c6f020f5fe97dde01ed17cf98eebb2]]]]
Former-commit-id: e1b0c5f102
Former-commit-id: cba8b1a043 [formerly 042ca4e3ac] [formerly 0d91c5d0a324d8adfbae13dd01caa6ab04972096 [formerly 66295d65c5]]
Former-commit-id: b75bf4c3fb2ddd36a8e78f589932630ac1ec6283 [formerly f62acd10cc]
Former-commit-id: c133eb60b0
2014-05-15 18:31:17 -04:00
Stephen Gilbert
636cc864f0 VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
PGEN Bug Fixes

Change-Id: Ie50d8f829e0dfb00fab254945a46592553cdb59c

Former-commit-id: 003aa6e113 [formerly be04b1b1d9] [formerly e71b522740] [formerly 003aa6e113 [formerly be04b1b1d9] [formerly e71b522740] [formerly d6f370db60 [formerly e71b522740 [formerly 2f93fd7bdbcf1fa4698dfc2dd51c377db6d809b6]]]]
Former-commit-id: d6f370db60
Former-commit-id: b1010b6ba2 [formerly 2c95dc0f33] [formerly 96e833926a756629ee7be92422b29c3dce611984 [formerly c0e6cd6c50]]
Former-commit-id: d697595214ba804e8a1df8e0dd1ae31e1f777bd2 [formerly e28025279a]
Former-commit-id: 003cc88250
2014-05-15 17:40:04 -04:00
Stephen Gilbert
0c18dea9d7 VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
Localization/configuration file updates

Change-Id: I489d8228f17534234cd8ea20e10a137a17bad054

Former-commit-id: 5e1cd16ad7 [formerly cb483a72ff] [formerly 60b9ec665b] [formerly 5e1cd16ad7 [formerly cb483a72ff] [formerly 60b9ec665b] [formerly 4f2a631e66 [formerly 60b9ec665b [formerly c55835291b5d2bbe24c4398851e23a5c28d5e582]]]]
Former-commit-id: 4f2a631e66
Former-commit-id: 85c9f61b38 [formerly cc68098978] [formerly 32f754fffa7ecc95753f5afb665a6cb6cd698cf9 [formerly 6f18460949]]
Former-commit-id: 1f0e90b2b4149fc6b5c78546097d7f3f6f71bdac [formerly 88bc615345]
Former-commit-id: 7d566ea81c
2014-05-15 17:25:39 -04:00
Stephen Gilbert
b5652a1de4 VLab Issue #3722 - SWPC delivery for 14.3.1
Upgrades to Geomag and solar image processing

Change-Id: Ibe33d00843419e34998274a87734f3f29d2b63dc

Former-commit-id: 5b0c446a2f [formerly ed8b7bc0cb] [formerly 5da74a455d] [formerly 5b0c446a2f [formerly ed8b7bc0cb] [formerly 5da74a455d] [formerly 4d2154d2de [formerly 5da74a455d [formerly c9bcc3d15adcea014696e5cd68b9688506ee07d9]]]]
Former-commit-id: 4d2154d2de
Former-commit-id: 8fb3efb83c [formerly 2e9673e057] [formerly eefe590edb8a5aa84d1020016131e4fee6f9305e [formerly c3b1cda7c5]]
Former-commit-id: 050f5be3922d365c41453ffc8c0419683048d9da [formerly bcc628c19f]
Former-commit-id: 979b93c0e8
2014-05-15 17:24:13 -04:00
Stephen Gilbert
4e6957b497 VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
Table updates for GRIB decoding; Updates to gpd, mcidas, pafm, and pgen
plugins

Change-Id: Ic6874210998d7f5a6b164ef45c6918246388ee68

Former-commit-id: 80c8dae07c [formerly 4602f86f47] [formerly bd2dad11b5] [formerly 80c8dae07c [formerly 4602f86f47] [formerly bd2dad11b5] [formerly ca9b7c8dfc [formerly bd2dad11b5 [formerly 3c904361e7176592cc873a3414c18ad5107aea54]]]]
Former-commit-id: ca9b7c8dfc
Former-commit-id: e325f8681e [formerly da02372ba6] [formerly 14374ef5541f62dc41754f884fecd9cb2dab8bd0 [formerly 4e5968d7b6]]
Former-commit-id: 1a4c235707b872790ae8769be83f713f6dd05c30 [formerly 7730224fe9]
Former-commit-id: 47658e4f9b
2014-05-15 17:20:52 -04:00
Brian.Dyke
bb71483e38 Merge remote-tracking branch 'remotes/origin/master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-5 into 14.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py

Former-commit-id: f9a40a24e3 [formerly 2de7de6378] [formerly b066572041] [formerly f9a40a24e3 [formerly 2de7de6378] [formerly b066572041] [formerly c8f21e92fe [formerly b066572041 [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]]]
Former-commit-id: c8f21e92fe
Former-commit-id: fc476a1286 [formerly 7cc4e0258d] [formerly 24586b50613dc8d4739299b6e8346907dcc7c9c1 [formerly 984f56d23c]]
Former-commit-id: fe64de1e302eac38e0e4ddadb14f850e2fc849b8 [formerly 17d7291548]
Former-commit-id: 43210259de
2014-05-15 16:40:47 -04:00
Brian.Dyke
fee860b080 CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: ac7b375d91 [formerly 08f69fd3a1] [formerly 81a1affe22] [formerly ac7b375d91 [formerly 08f69fd3a1] [formerly 81a1affe22] [formerly c81d54b651 [formerly 81a1affe22 [formerly 11acfb00bda7686c68e24903df4831cf57bf86de]]]]
Former-commit-id: c81d54b651
Former-commit-id: cc09a85660 [formerly fe9ee785b6] [formerly ba771ce0e5ca8e2a54ee28250070016a434fb6dc [formerly cf4eca67af]]
Former-commit-id: fe9511cd130e36a1d2520f1222e0d8300e6da5c7 [formerly 77344c1e1f]
Former-commit-id: 33211da425
2014-05-15 14:16:38 -04:00
Steve Harris
39c49a5f8f Merge branch 'master_14.2.2' (14.2.2-9) into omaha_14.2.2
Former-commit-id: e05747f71e [formerly 01a6ce5b9b] [formerly 85850ed33e] [formerly e05747f71e [formerly 01a6ce5b9b] [formerly 85850ed33e] [formerly a6aa34210c [formerly 85850ed33e [formerly b1bf5bdc4a81c55c9cd30ac77857509a2e8f5a08]]]]
Former-commit-id: a6aa34210c
Former-commit-id: 758f07fea0 [formerly 9496e2ccdc] [formerly 09d30738acbd13c4f3f0780bc4acb3c739421998 [formerly 0ebb502663]]
Former-commit-id: 00f8adf90bd3b806c7c9b1a10eb64bc6e33822c6 [formerly ba87dbd03f]
Former-commit-id: 2f537f102e
2014-05-15 08:12:49 -05:00
Roger Ferrel
43911d490e Issue #2881 configuration changes.
Former-commit-id: 9d4e4ac430 [formerly 422504f8b8] [formerly e6b3733fc5] [formerly 9d4e4ac430 [formerly 422504f8b8] [formerly e6b3733fc5] [formerly 365c886263 [formerly e6b3733fc5 [formerly a36e9351bec9150ba4ade456de76af8701048bcb]]]]
Former-commit-id: 365c886263
Former-commit-id: 6b3050e45c [formerly aa2fffd408] [formerly 4e6453d23a43551a5f284f35a7497ccbaff42c4d [formerly f2d8dee5ea]]
Former-commit-id: 80bdd83373c3a7f811c94e65a6d22f07e1cdbcbd [formerly 59d4dcd739]
Former-commit-id: 35ac239778
2014-05-14 16:35:33 -05:00
Dave Hladky
d4046a9dfe Issue #3168 Move DD retrieval distibution to correct feature/RPM
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1

Former-commit-id: 0e73a4d2a8 [formerly 3b544c74b6] [formerly c72be97b9b] [formerly 0e73a4d2a8 [formerly 3b544c74b6] [formerly c72be97b9b] [formerly 783cd9e308 [formerly c72be97b9b [formerly d94e7f139573caa508b260902870c9f745080bb8]]]]
Former-commit-id: 783cd9e308
Former-commit-id: 8248c69492 [formerly 971910f7fc] [formerly 86951af90c14b8faa6f0c72f4a63cc9c73be2211 [formerly 25c2dd4f7d]]
Former-commit-id: 83ad1d6914a482b12087c4ed7477ccc1404ba0a1 [formerly 88ebc6921e]
Former-commit-id: 7868ab0891
2014-05-14 16:13:57 -05:00
Brian.Dyke
0febfec9e7 Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.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.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
	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
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly d3fa10028c [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]]
Former-commit-id: d3fa10028c
Former-commit-id: a6b42a776b [formerly b0837b4905] [formerly 91d88625eae6852df94fbb04133d89826c605aad [formerly 68f3a0169e]]
Former-commit-id: c54c6441e46c95271889db670ff46e1bedce8459 [formerly f87775928f]
Former-commit-id: 1d53f6d304
2014-05-14 16:08:16 -04:00
Shawn Hooper
329c115f61 Merge "ASM #560 - LDM 6.11.5 GRIB library causing crash Modified Release number in component.spce from 10 to 11" into asm_14.2.2
Former-commit-id: 183109f238 [formerly 3143b15d26] [formerly 2fe0c47c6d] [formerly 183109f238 [formerly 3143b15d26] [formerly 2fe0c47c6d] [formerly 24918bda30 [formerly 2fe0c47c6d [formerly b774242fcff4bf603b82c8a6657e372d8bdc3c19]]]]
Former-commit-id: 24918bda30
Former-commit-id: 5c85790b1a [formerly 93977713d5] [formerly 09fb99b46539c0e3080552d805df6a73630991ad [formerly e70f2dd6fa]]
Former-commit-id: d9643a730ec986a210bb4b40bbd671f00d9ec461 [formerly f684b16dcd]
Former-commit-id: 5106bea20c
2014-05-14 14:39:57 -05:00
Qinglu.Lin
2e3a1d2374 ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c

Former-commit-id: c9e359f947 [formerly b7d276d00f] [formerly 75c4b15e8e] [formerly c9e359f947 [formerly b7d276d00f] [formerly 75c4b15e8e] [formerly c5097660c2 [formerly 75c4b15e8e [formerly 763641d787f7f8c79bf28456314dcc16786702ed]]]]
Former-commit-id: c5097660c2
Former-commit-id: bdf527d5f2 [formerly bdae3cdfdf] [formerly cba5eacd009b07ca51d595c26e8a4b851d4605b4 [formerly 89fa05128e]]
Former-commit-id: 129e4eff1386649cdd84ed945399d5abd11dab4a [formerly 42c5ce2aff]
Former-commit-id: 603c6a1843
2014-05-14 15:30:16 -04:00
Dave Hladky
f640ba1eeb Issue #3168 Move retrieval distribution to correct DD RPM
Former-commit-id: 6a80ab5dfb [formerly 40c24180cf] [formerly ca644b93ee] [formerly 6a80ab5dfb [formerly 40c24180cf] [formerly ca644b93ee] [formerly 15366714ed [formerly ca644b93ee [formerly 228ef1ceb7337fa38c370c3218d1c32b4f1302fb]]]]
Former-commit-id: 15366714ed
Former-commit-id: 02b2c05d0f [formerly f878ccb04e] [formerly 45e1e810677500f358f651b3e5c5e4eb36b9a380 [formerly 268765da81]]
Former-commit-id: 73f6de0ebf8291c21795f1249a9c5a88c06f7da6 [formerly 16a5eed943]
Former-commit-id: cc7a9bce10
2014-05-14 11:12:55 -05:00
Steve Harris
caaa13555f Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
Former-commit-id: 293dafa266 [formerly bef1d9681c] [formerly 2247a499c4] [formerly 293dafa266 [formerly bef1d9681c] [formerly 2247a499c4] [formerly f5bc8e598b [formerly 2247a499c4 [formerly a2f35d52b5ffbf2fee8bd953eb795810972e4e53]]]]
Former-commit-id: f5bc8e598b
Former-commit-id: 0923a4a1a2 [formerly db6ea622c8] [formerly 8454f26a92d83110bd349b9d0126dc9e2e9349c1 [formerly 4672bea191]]
Former-commit-id: c128e0af02d64f83035cbad73cd46d19b65fa6ac [formerly 1eaf158cad]
Former-commit-id: 2bdb2197a7
2014-05-13 15:32:39 -05:00
Steve Harris
8094b08c85 Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
Former-commit-id: 2441e29987 [formerly 462609aa3f] [formerly c2efe26c11] [formerly 2441e29987 [formerly 462609aa3f] [formerly c2efe26c11] [formerly 70b95c7636 [formerly c2efe26c11 [formerly 2627e4d38b3dcee82dcf7a6032d692170d50d9ad]]]]
Former-commit-id: 70b95c7636
Former-commit-id: 5e4d9f666a [formerly 29ecfa91cb] [formerly 3673c0fa579962cf3044e6137a5507dc3bb4de20 [formerly 667dff3919]]
Former-commit-id: e594bb821ece4ea9a92f332eaab265eb722f2b1a [formerly 292bb044a8]
Former-commit-id: 80d1cec3ec
2014-05-13 15:23:57 -05:00
Bryan Kowal
0f31d0f4e3 Issue #3159 - rebuild with newer gridslice source
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc

Former-commit-id: aacf4cd27a [formerly a352aadc90] [formerly 3535340136] [formerly aacf4cd27a [formerly a352aadc90] [formerly 3535340136] [formerly 8d5326cc1b [formerly 3535340136 [formerly 2b13221d7c644147f6eda1acb8b126667be00926]]]]
Former-commit-id: 8d5326cc1b
Former-commit-id: 1f5cd33be3 [formerly 1c64a47950] [formerly d3a06fdc9c2c6bb26a6dce8456bf87bd02b9492d [formerly 43eddea171]]
Former-commit-id: acd94bad9932a841706c10b0b8ac148bbe3c6f9f [formerly 4e3afb78fc]
Former-commit-id: ddf6cc758d
2014-05-13 14:43:04 -05:00
Brian.Dyke
db6b79a08f Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
Former-commit-id: e705786d12 [formerly 5a2e0c7e1b] [formerly e95bc87a19] [formerly e705786d12 [formerly 5a2e0c7e1b] [formerly e95bc87a19] [formerly fb4c7e55b3 [formerly e95bc87a19 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]]]
Former-commit-id: fb4c7e55b3
Former-commit-id: bdbb6ec0fe [formerly f9474b087e] [formerly adafd612a1e8c387205bf9a2e7dcfd2a03d117c9 [formerly 0311366ffb]]
Former-commit-id: 4d9e420076ab9a3d2cb731f4d97896138289b45b [formerly 3b7a2f1645]
Former-commit-id: 4cedfadd77
2014-05-13 11:23:55 -04:00
Matthew Howard
f2fda36e49 Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
Former-commit-id: 84f26ca9f5 [formerly 7b087f422d] [formerly 5a20085f32] [formerly 84f26ca9f5 [formerly 7b087f422d] [formerly 5a20085f32] [formerly 576a2d63ec [formerly 5a20085f32 [formerly 2052df4ca5f68165b477994b21357c245ff73546]]]]
Former-commit-id: 576a2d63ec
Former-commit-id: 07372d5761 [formerly c919d3503a] [formerly 47aa58262f08efbcc70ce1e004c35606ebb7c410 [formerly 1026f04671]]
Former-commit-id: 900606d92eeface052fd5eb0751fd480fc46e5f6 [formerly 56778b394b]
Former-commit-id: 26c357a549
2014-05-13 07:49:18 -05:00
Paul.Grell
2ee482c43e ASM #512 - Need radar data watchdog functionality
Change-Id: I3bcdbe8f267f78be1d0bc64e466ffed70be011a3

Former-commit-id: d74a7c5460 [formerly 0c8c5ef728] [formerly 9988804887] [formerly d74a7c5460 [formerly 0c8c5ef728] [formerly 9988804887] [formerly 7e036b2bbc [formerly 9988804887 [formerly ad727f0b3d820cf2310b4b8cc67639b6d141af6b]]]]
Former-commit-id: 7e036b2bbc
Former-commit-id: 8b27ddec12 [formerly 30dd189c72] [formerly 80c06a0313182172da2f1db53157034e32cdf346 [formerly c6aa190a43]]
Former-commit-id: 1ca89b462c6f0eb3a01f31d657f1509b68ac09f5 [formerly c741760dd2]
Former-commit-id: 4493e0608e
2014-05-12 20:00:18 -04:00
Richard Peter
d2ad15857f Issue #2854: Fix merge of textdb
Change-Id: I626eabc72fbedde983e592ec0c8fb50ed1f52ae3

Former-commit-id: 3bca4a1d8a [formerly 559907c32d] [formerly 1dc654c20e] [formerly 3bca4a1d8a [formerly 559907c32d] [formerly 1dc654c20e] [formerly dd35516290 [formerly 1dc654c20e [formerly 2335691bb79c14d96e286f9b0be0f5085711c7bc]]]]
Former-commit-id: dd35516290
Former-commit-id: 01e4c18251 [formerly d6805f94d3] [formerly add4fc5fbdf8d035847ceb8e6b2d3b0be5190f9c [formerly 93520a29d3]]
Former-commit-id: ce5f939932d589d07a046ee9a2faf5d25af01cd6 [formerly 2abb1ca090]
Former-commit-id: 8ea97f96ac
2014-05-12 17:31:06 -05:00
Richard Peter
57827e54b6 Merge "Issue #2060: Consolidate grid indexes." into omaha_14.3.1
Former-commit-id: 92c5d07540 [formerly dce450fb3a] [formerly 5233493186] [formerly 92c5d07540 [formerly dce450fb3a] [formerly 5233493186] [formerly e3e9664336 [formerly 5233493186 [formerly 462ca3c56b516217043d09f9bf0c6c6b7a151044]]]]
Former-commit-id: e3e9664336
Former-commit-id: 3bbae61ccd [formerly 467c58ce7b] [formerly bc2ff1654756a91a2d3e4ca2f75c3b43ca1ca201 [formerly 0ed865a59c]]
Former-commit-id: 4464b9597317b78b04edb586462e6e6ded2aa17a [formerly 915766741c]
Former-commit-id: a36c40491f
2014-05-12 17:09:56 -05:00
Richard Peter
c49a3c8c52 Issue #2060: Consolidate grid indexes.
Change-Id: Ibc77133cd1b016ef85bae61e47e373a30e6e4d23

Former-commit-id: bbdd7c01a7 [formerly 50fb33488c] [formerly 62e215eb89] [formerly bbdd7c01a7 [formerly 50fb33488c] [formerly 62e215eb89] [formerly 6143d43329 [formerly 62e215eb89 [formerly 892c0f28a13d53118141efe14762deebe169d7ba]]]]
Former-commit-id: 6143d43329
Former-commit-id: d388968728 [formerly e2954e54db] [formerly 1c9d2bd0f67d7550e07bd561196d5aebc3919b29 [formerly 32f7bd8735]]
Former-commit-id: ff44d778e1b13fc9d813d4322f74d4f8aeebf256 [formerly 28eb882fb6]
Former-commit-id: bb580d8e7c
2014-05-12 16:59:34 -05:00
Brad Gonzales
abcc76cfd3 Issue #2873 Revert the deletion of the ncep nsharp win32 project.
Amend:  added the gov.noaa.nws.ncep.ui.nsharp.win32 plugin dependency back to the com.raytheon.uf.viz.ncep.nsharp.feature/feature.xml.

Change-Id: Ic801fbfd81c691298751d0bafbc4d96ba1457776

Former-commit-id: 0dd37a6075 [formerly 4e597afe11] [formerly b341c10bb4] [formerly 0dd37a6075 [formerly 4e597afe11] [formerly b341c10bb4] [formerly 9c86a55171 [formerly b341c10bb4 [formerly 8209ff5c53bb117b8a18b2923952b289e3021762]]]]
Former-commit-id: 9c86a55171
Former-commit-id: 9b2a9e4769 [formerly 04fb0a773c] [formerly b7a4f85e6c9b35e68a396ec8f252f41297781127 [formerly 40f9f6e788]]
Former-commit-id: 7dbd49bc3209b3e7b01f9e5afd84b569c2a788ca [formerly 5496aab450]
Former-commit-id: 2023a2156a
2014-05-12 16:59:16 -05:00
Steve Harris
24df80c520 Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
	tests/.classpath
	tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
	tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java

Former-commit-id: 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: ae2d525c8a [formerly 32f255cada] [formerly a8635bd2e1fdd0fe84e47c2435e9f0073d86e4e2 [formerly 233922471a]]
Former-commit-id: d12e1920a9ce76da64ae45fed23fe5b2ed9fa884 [formerly 74a325ce74]
Former-commit-id: 82045e2409
2014-05-12 16:13:19 -05:00
Juliya Dynina
2eba3d8214 Merge "ASM #539 - Multiple flag functionality for textdb is not working properly" into asm_14.3.1
Former-commit-id: acd50d3ec2 [formerly 161d2039f7] [formerly a203a14e52] [formerly acd50d3ec2 [formerly 161d2039f7] [formerly a203a14e52] [formerly 2578e13ee8 [formerly a203a14e52 [formerly 3fcd47133ac461046524837f085359b5eb1c7ba7]]]]
Former-commit-id: 2578e13ee8
Former-commit-id: df08ec72c7 [formerly f62a15f8e7] [formerly 963b1011316cdb307e20497d8a59a2f7bc6c4c80 [formerly 212d220bf7]]
Former-commit-id: 2721d69a7c14666f7c1884fd811590e97bb837e5 [formerly 783fd63389]
Former-commit-id: 3850e43354
2014-05-12 14:52:50 -05:00
Zhidong.Hao
32dfe53122 ASM #509 GFE: Product editor still auto-wraps when the option is turned off
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4

Former-commit-id: 1f48dcab3c [formerly 30b42030dd] [formerly d6cae51207] [formerly 1f48dcab3c [formerly 30b42030dd] [formerly d6cae51207] [formerly 030b767299 [formerly d6cae51207 [formerly a48b81894fed165aba58a0097359bbd0f1931be5]]]]
Former-commit-id: 030b767299
Former-commit-id: 79bdecf1b8 [formerly 31678eb223] [formerly 9d71f6e714e3aecf1dd6c690b838b59429ab91c9 [formerly 88c5e2d94c]]
Former-commit-id: 0437116819d26dce5a01e1304b4c62391d0a1a24 [formerly 6dd1289c31]
Former-commit-id: af44604e04
2014-05-12 15:16:38 -04:00
Kiran.Shrestha
532d416442 ASM #539 - Multiple flag functionality for textdb is not working properly
Change-Id: I6f48e877a356fa576e1311da769c90735e61877f

Former-commit-id: 90e1ca7e3d [formerly d4970b6f2f] [formerly e615e1efc5] [formerly 90e1ca7e3d [formerly d4970b6f2f] [formerly e615e1efc5] [formerly c162868850 [formerly e615e1efc5 [formerly 2e2de40d75c0ebc0af1b2d70806e834c7d5089f8]]]]
Former-commit-id: c162868850
Former-commit-id: 5b4bdf753e [formerly d0ed79310a] [formerly 8a5b8a227ba3ac536e32dcf3924c0c1a14daef85 [formerly 943efbc9d0]]
Former-commit-id: 0264965a43bc71a352cfa5e15c45e64da4fbe0f4 [formerly ce58e209b9]
Former-commit-id: 3173d32583
2014-05-12 15:16:14 -04:00
Juliya Dynina
ba181eea5c Merge "ASM #527 update revision and shef_qual_code" into asm_14.3.1
Former-commit-id: 2823c88634 [formerly 43b45e9f53] [formerly 107b64a544] [formerly 2823c88634 [formerly 43b45e9f53] [formerly 107b64a544] [formerly e33a27684c [formerly 107b64a544 [formerly 0c54c56efa1306d781d64621ccf7f62b3bf70997]]]]
Former-commit-id: e33a27684c
Former-commit-id: e8223877d3 [formerly ed4e911992] [formerly 0121968464af80dafc37b5848c20eb3b2a4d7f91 [formerly a0b2051e7e]]
Former-commit-id: 8987371d7a81205fd49a4ef37c8ee4ba21e50a83 [formerly ce9120be90]
Former-commit-id: 00bab1367a
2014-05-12 14:01:40 -05:00
Juliya Dynina
bdb5b6e82c Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 597facb18f [formerly 6713e83ae6] [formerly d7bea845fe] [formerly 597facb18f [formerly 6713e83ae6] [formerly d7bea845fe] [formerly 4f7fa8a8de [formerly d7bea845fe [formerly 350448988d24fd2eb58812128b062e3a0f44b956]]]]
Former-commit-id: 4f7fa8a8de
Former-commit-id: 9b53347004 [formerly cd1f437163] [formerly ae4d0d175756595f51c68e474a9add2068adada2 [formerly 190bf23ba8]]
Former-commit-id: 4ce2923fd5b1179225894529a6804e9fc57728a4 [formerly b65a50fd3e]
Former-commit-id: 2e191584e6
2014-05-12 14:01:07 -05:00
Ana Rivera
73dc79feda VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Former-commit-id: 49512f29bf [formerly 7e74e047a0] [formerly 91715e7a3f] [formerly 49512f29bf [formerly 7e74e047a0] [formerly 91715e7a3f] [formerly 81a9d4fa44 [formerly 91715e7a3f [formerly e71ef5db23122405fc6aab71526a9cc3ec3ad823]]]]
Former-commit-id: 81a9d4fa44
Former-commit-id: 950ceec5ef [formerly e33c6e2d69] [formerly 895faa71ddb8f2d028597a09ba5b9d1586644e9d [formerly 88520fc206]]
Former-commit-id: 520cb0cff082dafca89cc471443ec0532a3e3db4 [formerly 8cb1bfc3b8]
Former-commit-id: 94ceb3698f
2014-05-12 18:55:06 +00:00