tree 8d22cfe5befffefefe92bc93f13412aa9ede7744
parent 1048cefa4ece13de2f08ade74c56c30a42cbf73b
parent ccc656e1443d5a7c2babcd9c8d6ed0b25e20880f
author Michael Jumper <mjumper@apache.org> 1746169091 -0700
committer Michael Jumper <mjumper@apache.org> 1746169091 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE9GflSsxS8dJ3iCaGWyl3ruXkUY8FAmgUbQMACgkQWyl3ruXk
 UY9hoRAAilYvU3q9ns2b2IFqueezpM7kf0XKX2RYNCX/36Dql9x5nSg6WE2ktjxB
 yuZCsyifZJSx7WQQp3ZrOqBcVFfHTN226ZrPccN/KzgxeESPIi3bvOH7Kc9yLJey
 BEbEbfo931rtBpUJgQFX1B+o1Bt02aL+qvEfOkykTRyw5RsQXdwJJTPxATuf01nM
 oJeqfnMSocTGC6YoQ3YeZAQ65XzlSY7rPs70I6FGwUPZLSu1uD1/bbARVbfMdTnK
 +xzh75Qn2envMH+O7kECVusD5GA0JdTF9ZQ+gCJ5BZBxMuFy0lLx1Li1wIjZk/yE
 4om73zz5oKqDChrMxMsnrC/QkzuzIfR7lCdr9fEOfCdlNTsi8LeEj0QQsyabkAVl
 UJSb2cHdFYYjzNJ2YbHsBxfQRFRvjPm/oVxnu1GHel0VE1yqTMO2C3OwSZXa0z4G
 xSSrg5/AdjkpQXuycd7RFBnbkMij0NRFI6hx6L7fVRUNdXFb2q9w6lg5ajKZ6XU5
 TxDmuMeWBQdzbAA9MjsBr3rF+vdhNL4/d2k2+NfKFO6ckKldzPk3ViPGn1cyqYMS
 iRvyk/YiADYJadVeUxI8bP3H1xbW2N3rkPpoLImnvEMrE8TCMf5cP9IBrcrAPn7Y
 gkofP9pNDOPB81PZJV+EVegHBUy7phGFxmUXexrIv0ISblI+s84=
 =ECRk
 -----END PGP SIGNATURE-----

Merge 1.6.0 changes back to patch.