xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2651 commits 31 branches 40 tags 3.8 GiB
Commit graph

2651 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nate Jensen
2cad335e87 Issue #1926 faster and cleaner cell track rendering 
Change-Id: Idf5496946a6568640c465f5043ca098afe46c2c9

Former-commit-id: 4dc01c1830 [formerly 64440f97ef] [formerly 3294b4aea3 [formerly 74b82955cf41099b5bc2fcc726ea515366722925]]
Former-commit-id: 3294b4aea3
Former-commit-id: 2b5144aed9
 2013-04-24 10:01:20 -05:00
David Gillingham
89b529ca6e Issue #1937: Speed up ifpnetCDF by using WECache to prefetch grid/histories as in A1. 
Change-Id: I842562407cf93f38ea7b64d6fc739503f02c4c39

Former-commit-id: 23272028fa [formerly ee77d2ab1b] [formerly c36180538c [formerly e203ff703fa1d0ea65f688026cb95103795d0c51]]
Former-commit-id: c36180538c
Former-commit-id: f99b700508
 2013-04-23 15:45:24 -05:00
Richard Peter
310157dac0 Merge "Issue #1938 - install the postgis legacy functions for the metadata and maps database during installation." into omaha_13.4.1 
Former-commit-id: ae0ecbc72d [formerly 36ba9558a5] [formerly 2a7f4bd2ae [formerly 6d52bcf8d7eeb147af804b93508f4a4dfeea5e87]]
Former-commit-id: 2a7f4bd2ae
Former-commit-id: c4a76615fc
 2013-04-23 15:18:27 -05:00
Nate Jensen
7e6149c026 Issue #1926 somewhat free up UI thread on scan startup 
Change-Id: I51e704efa3df6abb6ec84b68d8dfcb46bac61d7b

Former-commit-id: eabd8e2ab2 [formerly e917657497] [formerly e7ef0a3b87 [formerly dcb9b18777981409d109ecc314873914c8d27fbf]]
Former-commit-id: e7ef0a3b87
Former-commit-id: 129feaee97
 2013-04-23 15:06:10 -05:00
Dustin Johnson
1f2c83ebbe Merge "Issue #1931 Implemented REST binding for registry" into development 
Former-commit-id: 2e546327c0 [formerly 8ef0378f0d] [formerly b2918c3681 [formerly bd0690f57cfe70da0314ef0d8897c7a72cb3dc47]]
Former-commit-id: b2918c3681
Former-commit-id: cc4fd10fb1
 2013-04-23 15:02:20 -05:00
Nate Jensen
513cae9c54 Merge "Issue #1926 faster scan rendering and cleanup" into omaha_13.4.1 
Former-commit-id: eebf0969eb [formerly 1a5a1f3d08] [formerly 758e629b85 [formerly 0ba1b5d01d811fad55ac780434f558bc08f8a877]]
Former-commit-id: 758e629b85
Former-commit-id: 9e7ecf8bba
 2013-04-23 13:18:23 -05:00
Roger Ferrel
9e3fb2168f Issue #1790 Minor changes to bring code up to Raytheon standards. 
Change-Id: Iad49a91187bc8f6f4eab9be23fa030399bffd12b

Former-commit-id: d0bf884341 [formerly dd9012a533] [formerly 1f50588858 [formerly 89095dce81484d1629f399d849581585a8c67431]]
Former-commit-id: 1f50588858
Former-commit-id: adcd68a70d
 2013-04-23 12:20:53 -05:00
Bryan Kowal
5018b12ec6 Issue #1938 - install the postgis legacy functions for the metadata and maps database during installation. 
- accept DR for work

Change-Id: Ib19064e3a1ea446b3325979d816924a0f1a45b63

Former-commit-id: b3974dfe62 [formerly 87d0aa17a0] [formerly 99d74e39ea [formerly d90b1203df064a6461ad058a6c08e96d1ee7fd43]]
Former-commit-id: 99d74e39ea
Former-commit-id: 4dedf0b1eb
 2013-04-23 12:02:01 -05:00
Roger Ferrel
0018cad990 Issue #1790 Changes for non-blocking dialogs DescriptionDlg, FloodCategoryDlg, FloodDamageDlg, GageHistoryDlg, HydroGenConfigDlg, LowWaterDlg, NwrTransmitterDlg, PreferencesDlg, PublicationsDlg and QcAlertAlarmLimitsDlg. 
Change-Id: Ic4a3ccb3e13344244415786591accbffda0d0e96

Former-commit-id: 1af1e9e61a [formerly 75c1470c3a] [formerly 2dafedfed2 [formerly b9d5321cdeaeb9b37783e96b76321ddb90c0d6dd]]
Former-commit-id: 2dafedfed2
Former-commit-id: 399a54cc4b
 2013-04-23 11:42:14 -05:00
Nate Jensen
165130e5d9 Merge "Issue #1912 optimized the creation of NavigableMaps from aggregate records and delayed TreeMap creation to the tertiary loader." into omaha_13.4.1 
Former-commit-id: d9c9438b10 [formerly 2787b92e25] [formerly 2719884a00 [formerly 939260496435242e06f0ebfcd91fd271c1bde4e5]]
Former-commit-id: 2719884a00
Former-commit-id: 49c2fbadcf
 2013-04-23 11:05:12 -05:00
Nate Jensen
64bfa8ede1 Issue #1926 faster scan rendering and cleanup 
Change-Id: I825690a953fa0967a4c9a3f74ab58bda779068ca

Former-commit-id: 3f579d7568 [formerly 4f78929858] [formerly 1e419b79c2 [formerly 068d711ec098e55630eb087e4d6b1a16063ff0e7]]
Former-commit-id: 1e419b79c2
Former-commit-id: e7af935f4c
 2013-04-22 16:47:11 -05:00
Bryan Kowal
d3d3468bf9 Issue #1915 - Java 1.6u43 for MSFT Windows 
Change-Id: I55e6dcba097ee694a5a4aacb311c85052c2f663d

Former-commit-id: 0a1e4b2258 [formerly 127a2bd489] [formerly a2ad4d4d58 [formerly e9ae5b5d30cc1c5283aa947ed02b4d35c3cf3460]]
Former-commit-id: a2ad4d4d58
Former-commit-id: 65f487cb9a
 2013-04-22 16:41:37 -05:00
Bryan Kowal
e1cb97383f Issue #1835 - updates to the ldm rpm specification 
- su "-lc" will now be used when executing the commands to build ldm
- the ldm rpm will now create its own /usr/local/ldm link
- Amend: removed registry.xml, ldmadmin-pl.conf, *.tbl from the source tar
- Amend: create .bash_profile during installation
- Amend: archive any existing ldm directories before creating the link

Change-Id: I00ebf8e621e66ddc4270ecfb44801cac7a9315b5

Former-commit-id: 94affd80a0 [formerly 1fda784c0c] [formerly a6e4df1041 [formerly d6ae05c543d1c26d737f7dda97081e5400ea5c1e]]
Former-commit-id: a6e4df1041
Former-commit-id: 06c21f9828
 2013-04-22 15:31:54 -05:00
Benjamin Phillippe
6edfda46bf Issue #1931 Implemented REST binding for registry 
Change-Id: I604c02dc849e380f70e2d27fa1f2b30dadcf0776

Former-commit-id: 9a7971c872 [formerly 9065ebcb65] [formerly 3d2e073dd7 [formerly daef43d8947f690d15f9314f85b8cf31d30c06ab]]
Former-commit-id: 3d2e073dd7
Former-commit-id: cf7da4b001
 2013-04-22 13:17:53 -05:00
Ben Steffensmeier
2501a483b4 Issue #1912 optimized the creation of NavigableMaps from aggregate records and delayed TreeMap creation to the tertiary loader. 
Former-commit-id: 9643633de9 [formerly acaaca2e6b] [formerly 3e29e0ea1e [formerly 42cdc1cf810cfefc97c58932fde2051de0fea439]]
Former-commit-id: 3e29e0ea1e
Former-commit-id: 96c503bb2c
 2013-04-22 11:52:37 -05:00
Ben Steffensmeier
c5df5345b7 Issue #1912 decrease the number of seperate database requests in the FFMPDataLoader. 
Former-commit-id: e85f5fa0d0 [formerly 7a43a052f6] [formerly a0fb4b9b5b [formerly 1ba1f77bab277fb191a416e02f5cc56a0147b15d]]
Former-commit-id: a0fb4b9b5b
Former-commit-id: bd751b44f0
 2013-04-22 11:32:25 -05:00
Dustin Johnson
ef0c554826 Issue #1910 Changes to comply with the Ebxml 4.0 spec for SubmitObjects 
Amend: Rebase on newest development commits

Change-Id: I70fcf39d4c819e961921496c9a8f9097981b1de7

Former-commit-id: 42b2e12061 [formerly 457710f5d4] [formerly 3adc0f3bd9 [formerly 78bfd27bf513a4014c957a069432e8a05d519004]]
Former-commit-id: 3adc0f3bd9
Former-commit-id: 6b1bd85a9b
 2013-04-22 11:25:08 -05:00
Ben Steffensmeier
745c9e016b Issue #1912 increase bulk requests to pypies. 
Former-commit-id: 82d2c832b1 [formerly 2b11b35462] [formerly 0e59516135 [formerly 50da745da0b9e963c3505512b86b3c59101f8ed7]]
Former-commit-id: 0e59516135
Former-commit-id: f842d5d036
 2013-04-22 10:59:34 -05:00
Nate Jensen
5718dcb41a Merge "Issue #1638 Made string rendering always look right despite extent proportions so it is never warped. Moved dataURI map creation to DataURIUtil. Fixed double dispose of controls in VizDisplayPane, also made resize non interface method." into development 
Former-commit-id: 838764f6fc [formerly 7291751e25] [formerly 10a6569e15 [formerly 83643b2b8027b625be5e8f84e0f11ac22216dd64]]
Former-commit-id: 10a6569e15
Former-commit-id: 0d5b751c87
 2013-04-22 10:00:09 -05:00
Richard Peter
460cb47d76 Merge "Issue #1932 Allow yajsw to kill the wrapped process after timeout in debug mode" into omaha_13.4.1 
Former-commit-id: 037d696e80 [formerly cbee3b1ee4] [formerly 714aee8f6f [formerly 14af0c5f32ad02e9ec1a2db65c67f980ad7fddbe]]
Former-commit-id: 714aee8f6f
Former-commit-id: 545f495ee5
 2013-04-22 09:31:40 -05:00
Lee Venable
25bda37e80 Merge "Issue #1790 Changes for non-blocking dialogs CountyStateDlg, CountyZoneUgcDlg, DataAdjustFactorDlg, DataIngestFilterDlg, DataPurgeParamsDlg and DatumDlg; also changes to hydro data mangagers to remove ArrayList for method interfaces." into development 
Former-commit-id: 77ce4f1ee6 [formerly bbd95b4da1] [formerly 64a7e6f289 [formerly b3f3ac6dbffbc3522dfa2fa2e9de52959b630a41]]
Former-commit-id: 64a7e6f289
Former-commit-id: 2082d56998
 2013-04-22 09:22:14 -05:00
Nate Jensen
cba0db0c3a Merge "Issue #1915 - updated Linux java to 6u43." into omaha_13.4.1 
Former-commit-id: 2c7a8b0d15 [formerly 7fbc2427cf] [formerly 57ccac05e8 [formerly 53f84650e0436e61d21599178ee845a8f9588e29]]
Former-commit-id: 57ccac05e8
Former-commit-id: 09edb866f3
 2013-04-22 09:13:28 -05:00
Nate Jensen
a46419805e Merge "Issue #1926 speed up scan startup by not requesting PDOs since we have URIs" into omaha_13.4.1 
Former-commit-id: 20596ce69f [formerly 21605fe89f] [formerly a4a0bb6695 [formerly d4c7a6c1c8f91c2c4de2e247c4a1e4c86ea8694f]]
Former-commit-id: a4a0bb6695
Former-commit-id: b466022745
 2013-04-22 09:11:02 -05:00
Dustin Johnson
77f8d21aad Issue #1910 Ignore abstract test 
Change-Id: I6406dd7e0a1cc663a5e961e475e73d2dcc60e335

Former-commit-id: a625160464 [formerly 9cf9068d0e] [formerly bf02570479 [formerly 5e8d880759699381fa4b1316fb1f8a1d4da98b11]]
Former-commit-id: bf02570479
Former-commit-id: 7df6e3dc90
 2013-04-22 08:48:51 -05:00
Dustin Johnson
b6f2a338b7 Issue #1932 Allow yajsw to kill the wrapped process after timeout in debug mode 
Change-Id: If638edfbb0111fb7b58901584899a0523142c518

Former-commit-id: 43314cdd3c [formerly 4128e76180] [formerly 86931a613a [formerly a8cbb9fb5341cfcc3af3272ba0700bfc451bc1d2]]
Former-commit-id: 86931a613a
Former-commit-id: 50dfb1f67c
 2013-04-22 08:31:05 -05:00
Max Schenkelberg
69abb31ee6 Issue #1638 Made string rendering always look right despite extent proportions so it is never warped. Moved dataURI map creation to DataURIUtil. Fixed double dispose of controls in VizDisplayPane, also made resize non interface method. 
Amend: Fixed menu mix up and making sure perspective bar is on by default

Change-Id: I0c19e5fbf0f0d29cdca0f63afb33ca964a145b94

Former-commit-id: c8fcaf06d1 [formerly b91b706701] [formerly 1d3c378dde [formerly 53e42aa3925399271cc3ad4ee964476ddffc8eb6]]
Former-commit-id: 1d3c378dde
Former-commit-id: e05c12e246
 2013-04-19 14:57:40 -05:00
Roger Ferrel
5406b16e40 Issue #1790 Changes for non-blocking dialogs CountyStateDlg, CountyZoneUgcDlg, DataAdjustFactorDlg, DataIngestFilterDlg, DataPurgeParamsDlg and DatumDlg; also changes to hydro data mangagers to remove ArrayList for method interfaces. 
Change-Id: Id5f56669045afd402bed893c13977641ef59835b

Former-commit-id: 2bcc5e655c [formerly c761fd0938] [formerly ec275df412 [formerly 23bf9839c60aa33d7bf43492b72acbeedcf518b9]]
Former-commit-id: ec275df412
Former-commit-id: ceb9d10fdc
 2013-04-19 13:42:46 -05:00
Greg Armendariz
3f5af9ead4 Merge "Issue #1835 - minor updates to the ldm specification" into omaha_13.4.1 
Former-commit-id: 0cd81b855f [formerly 96877d71ff] [formerly 5a4a2dea72 [formerly 03868f608e9dcef1855e316a5ab825246c370406]]
Former-commit-id: 5a4a2dea72
Former-commit-id: 33a7a2cdb3
 2013-04-19 10:42:29 -05:00
Bryan Kowal
9423b26507 Issue #1927 - fixed CAVE rpm dependency determination 
Former-commit-id: f78a58c6be [formerly 79e22d6770] [formerly 988fbfc8ad [formerly cc1a0ed662343a382f992bd43ba3b78c11cfd78b]]
Former-commit-id: 988fbfc8ad
Former-commit-id: c30292262a
 2013-04-19 08:36:10 -05:00
Bryan Kowal
3838fc2e43 Issue #1805 - edex-environment will now use the 13.4.1 path to access the EDEX service script. 
Change-Id: Idc3a9c692faf76ea81ba3d994e949f3fcb8416ca

Former-commit-id: f7eca8672c [formerly 7c0f1eb0f7] [formerly c02a38d7f2 [formerly 20d26f1a073a74abd595455af1800da790c36c0a]]
Former-commit-id: c02a38d7f2
Former-commit-id: e6c490852b
 2013-04-19 06:55:00 -05:00
Bryan Kowal
02c0ea7d8b Issue #1915 - updated Linux java to 6u43. 
Change-Id: I39bdb6bbb0cc23c457ddb08ba151ce0b707ff3e7

Former-commit-id: 8caf7c9404 [formerly c0227ea66d] [formerly 633b89da12 [formerly 0f5b4acf4a33a8b3c9a0ba8a30eed16822d117bb]]
Former-commit-id: 633b89da12
Former-commit-id: a2200c5742
 2013-04-18 23:51:54 -05:00
Nate Jensen
c4125bb32b Issue #1926 speed up scan startup by not requesting PDOs since we have URIs 
Change-Id: I7b223d9c94fb55931b1c650b115c545c7ca24180

Former-commit-id: 900f54d691 [formerly 96cdc7ce76] [formerly 91476c8e80 [formerly 96e1427daa378280133f85a1ee24647a72c8e9af]]
Former-commit-id: 91476c8e80
Former-commit-id: 74a5a462de
 2013-04-18 18:29:15 -05:00
Bryan Kowal
db4e03f80e Issue #1835 - minor updates to the ldm specification 
- the ldm rpm will now print error descriptions when the installation fails
- declared a depdency on zlib which is required to build noaaport


Former-commit-id: c305833e55 [formerly 1c40009549] [formerly 744f37dd96 [formerly eaf0391abdd276d362930243a461ee6ad70d8e31]]
Former-commit-id: 744f37dd96
Former-commit-id: 46fe3aee32
 2013-04-18 16:18:57 -05:00
Richard Peter
342357e226 Merge "Issue #1899 - edex-environment is now compatible with qpid 0.18." into omaha_13.4.1 
Former-commit-id: ac2965df6b [formerly 04a734a584] [formerly ea75ad5525 [formerly a62ac3a2c58bdacfd139d3c67cc769d185a1cef2]]
Former-commit-id: ea75ad5525
Former-commit-id: 3489d95e08
 2013-04-18 15:46:20 -05:00
Richard Peter
8c54d1415e Merge "Issue #1913 Fixed GFE level translation" into omaha_13.4.1 
Former-commit-id: 0b160892bc [formerly 0361d7a7bd] [formerly a47ca9d509 [formerly 54c5a68656e4d9859daf1d3ff4510419f3f2516f]]
Former-commit-id: a47ca9d509
Former-commit-id: 914100d33d
 2013-04-18 15:10:56 -05:00
Lee Venable
dfc4f50b3a Merge "Issue #1790 Changes for non-blocking CountyStateDlg." into development 
Former-commit-id: f12dec046b [formerly cf1347c380] [formerly 95b3e0dd4b [formerly 839e6d466d59e78d906380d742ea1999ff1115c0]]
Former-commit-id: 95b3e0dd4b
Former-commit-id: 8444e9ff54
 2013-04-18 14:42:48 -05:00
Bryan Kowal
cf71d24fff Issue #1899 - edex-environment is now compatible with qpid 0.18. 
- added change history

Change-Id: Ie6a47ed2413a366f1475d2be848ea05569c4e646

Former-commit-id: 64d9276e2e [formerly 0924bfd726] [formerly 86d8e511b5 [formerly a38c6c2014c3252b740ba434b44d09adbebb9991]]
Former-commit-id: 86d8e511b5
Former-commit-id: ff64a23deb
 2013-04-18 14:06:53 -05:00
Dustin Johnson
ef7be9524e Merge "Issue #1914 Add email notification as a notification listener" into development 
Former-commit-id: 1d906fecca [formerly b593a2581c] [formerly 4f60e45094 [formerly 1c6174bde3598fbe3b22aefb1c36a3a49968466b]]
Former-commit-id: 4f60e45094
Former-commit-id: 2c28b53ea4
 2013-04-18 13:25:57 -05:00
Dustin Johnson
6ded48bcd8 Issue #1914 Add email notification as a notification listener 
Amend: Fix broken test

Change-Id: I3b692255b5d84fffce174c0447970fe627f4a61e

Former-commit-id: f3d53eb889 [formerly 74a9b93d05] [formerly 067b20c684 [formerly 45b5a9cffd6c57dc8ea1355ee623fcf6014dd377]]
Former-commit-id: 067b20c684
Former-commit-id: 7b09a0e477
 2013-04-18 12:57:38 -05:00
Nate Jensen
068d35734a Merge "Issue #1916 fast rendering of CWAT Local Threat" into omaha_13.4.1 
Former-commit-id: fde67ea9bb [formerly 2680043152] [formerly d7248a4dd5 [formerly bcc532d51f7b38da2f37ff943358b489a6d248fe]]
Former-commit-id: d7248a4dd5
Former-commit-id: fe657596a7
 2013-04-18 12:42:27 -05:00
Dave Hladky
89ae841190 Issue #1919 Fixed broken VGB processing 
Change-Id: I4d0a1e3d2bdd13f474c33ded48620c740431719b

Former-commit-id: 179338b837 [formerly 30561c4d1b] [formerly f682fe4482 [formerly d8b9e5d236f15145ff395dcbd3d741c931ef39f7]]
Former-commit-id: f682fe4482
Former-commit-id: 4ffbe250a8
 2013-04-18 12:35:24 -05:00
Nate Jensen
880776f544 Merge "Issue #1638 Added viz base feature as well as personalities cave project extracting out non-awips specific things in personalities awips project" into development 
Former-commit-id: 27efccb414 [formerly 8f04f5329c] [formerly b8719b47c6 [formerly 2a198f5f3c8476888f2ea12679c1eb54f0b41c84]]
Former-commit-id: b8719b47c6
Former-commit-id: ad10365a43
 2013-04-18 12:31:39 -05:00
Nate Jensen
8b98d518c9 Issue #1916 fast rendering of CWAT Local Threat 
Change-Id: Ia8129ac6a81f35b1ed4aca19edfb21022cee2344

Former-commit-id: a1896e138e [formerly 91fbdd4ad1] [formerly 74edcf7706 [formerly 66a036b90f75a844cbeed3eb1a483ccdc72ec11d]]
Former-commit-id: 74edcf7706
Former-commit-id: 22f54ab95e
 2013-04-18 12:19:36 -05:00
Ron Anderson
c21f5438be Issue #1913 Fixed GFE level translation 
Change-Id: I2e59228991243d4178c73721d169f695d6581b8a

Former-commit-id: fdb69afb73 [formerly 75f802d348] [formerly 666263beb4 [formerly ed32dc366aae2fa64c02c9f32202aafb95845765]]
Former-commit-id: 666263beb4
Former-commit-id: 214738a19e
 2013-04-18 11:43:24 -05:00
Dustin Johnson
912cc39887 Merge "Issue #1914 Add plugin based registry notification" into development 
Former-commit-id: af04ecf92b [formerly 1edba0cdc6] [formerly 67eb771ccb [formerly 0b7539d488388f4f96af0ccf97f5651c8e7d8259]]
Former-commit-id: 67eb771ccb
Former-commit-id: 375221e524
 2013-04-18 11:00:57 -05:00
Benjamin Phillippe
f38475de7d Issue #1905 Implemented registry notifications via email 
Change-Id: I2753074c302d707066ac0de42ac5b0778049275d

Former-commit-id: a44a4b69ff [formerly a525a1430c] [formerly 7e6b8eedca [formerly e8dba1178491176da3543a46c0d543c489b5fcb1]]
Former-commit-id: 7e6b8eedca
Former-commit-id: 9742cc996f
 2013-04-18 10:19:12 -05:00
Nate Jensen
c79c2ce16e Merge "Issue #1916 overrode getDataTimes() to boost efficiency" into omaha_13.4.1 
Former-commit-id: 45ad0cbb85 [formerly 0de50ae786] [formerly 7562ac5edc [formerly ec6edaaad3943caf55f97e8f7fd9974086e3b360]]
Former-commit-id: 7562ac5edc
Former-commit-id: 25dfadb872
 2013-04-18 10:15:57 -05:00
Roger Ferrel
09a615a7c1 Issue #1790 Changes for non-blocking CountyStateDlg. 
Change-Id: I101202dbe8f5c1fdd9bac9b86a629960d9681e7d

Former-commit-id: 44bb7ab00d [formerly 910adae4ee] [formerly 9c428385ee [formerly a1b5f0b08a08bed1b76f81094970594aeae0a1f3]]
Former-commit-id: 9c428385ee
Former-commit-id: 04cd4f7f37
 2013-04-18 07:49:08 -05:00
Ben Steffensmeier
09c34a3eae Issue #1912 Initial bulk hdf5 access for ffmp 
Change-Id: If2b9afbd23d0388c16f05ddaaf47a1ac8dc6b339

Former-commit-id: 7a5835a43a [formerly 4db55d9a58] [formerly fada8ae7dd [formerly 972ca525d04ca13eb43816bdfeb9bf4fb4786d76]]
Former-commit-id: fada8ae7dd
Former-commit-id: 84ee23cc58
 2013-04-17 16:35:50 -05:00
Nate Jensen
d4273c8b41 Issue #1916 overrode getDataTimes() to boost efficiency 
Change-Id: Ic9b3c6ddd2885f3fdef56910cb1e829387d48872

Former-commit-id: df2823edea [formerly 834d36e1a9] [formerly f2b383d4d6 [formerly cd6133708f29ea162ae3fe5456a2d8463e60dce3]]
Former-commit-id: f2b383d4d6
Former-commit-id: 181b717cf2
 2013-04-17 16:21:20 -05:00