what's the strategy for code sync between branches e.g. scala-2.10 v.s. master?

2013-11-04 Thread Liu, Raymond
Hi It seems to me that dev branches are sync with master by keep merging trunk codes. E.g. scala-2.10 branches continuously merge latest master code into itself for update. While I am wondering, what's the general guide line on doing this? It seems to me that not every code in

Re: issue regarding akka, protobuf and Hadoop version

2013-11-04 Thread Reynold Xin
Adding in a few guys so they can chime in. On Mon, Nov 4, 2013 at 4:33 PM, Reynold Xin r...@apache.org wrote: I chatted with Matt Massie about this, and here are some options: 1. Use dependency injection in google-guice to make Akka use one version of protobuf, and YARN use the other

RE: issue regarding akka, protobuf and Hadoop version

2013-11-04 Thread Liu, Raymond
I plan to do the work on scala-2.10 branch, which already move to akka 2.2.3, hope that to move to akka 2.3-M1 (which support protobuf 2.5.x) will not cause many problem and make it a test to see is there further issues, then wait for the formal release of akka 2.3.x While the issue is that I