- Added automatic merging for 2.2 -> 2.3 & 2.4
- Performed initial 2.2 -> 2.3 merge. Had some problems
- Banged my head trying to get Samba 3 to work on sonlinux
- Assisted James installing some packages on sonslinux
Dylan discussed with me that we should be merging fixes forward from 2.2 -> 2.3 and from 2.2 -> 2.4. Eventually we will need to merge 2.2 -> 2.3 -> 2.4 but doing so now might cause problems with the 2.3 -> 2.4 merge. I guess 2.3 is in a little bit of flux right now.
Discussed this with Jeff and he agreed. The merging schedule for this is set to weekly. 2.2 -> 2.3 merging happens on Sunday (at 5:30 Am in Santa Clara and 9:30 Pm (Sunday night) in Shanghai - roughly the same time given the timezone difference). The 2.2 ->2 4 merge happens on Tuesdays @ 5:30 Am Santa Clara and 9:30 Pm Shanghai time.