...
[11:54:55 CDT(-0500)] <athena1> excellent 
[15:31:07 CDT(-0500)] <athena1> EricDalquist: what's the best way to make sure 4.0.x has all the relevant 4.1.x fixes?
[15:31:19 CDT(-0500)] <athena1> can i just cherry-pick a commit into th e4.0 branch, then commit?
[15:31:26 CDT(-0500)] <EricDalquist> yup
[15:31:29 CDT(-0500)] <EricDalquist> cherry pick does the commit
[15:31:30 CDT(-0500)] <athena1> excellent
[15:31:33 CDT(-0500)] <EricDalquist> unless there is a conflicty
[15:31:36 CDT(-0500)] <EricDalquist> so commit on master
[15:31:44 CDT(-0500)] <EricDalquist> cherry-pick into 4.0
[15:31:45 CDT(-0500)] <EricDalquist> and push
[15:31:52 CDT(-0500)] <athena1> and i can probably use the log tool to report stuff in 4.1 that's not in 4.0?
[15:32:01 CDT(-0500)] <EricDalquist> yeah
[15:32:05 CDT(-0500)] <athena1> excellent