Updates of master branches

I am in the process of pushing 'stuff' to the master branches in order to pave
the road to the 2.2.0 release. This is what you can find on gitorious:

RTT:
merged Sylvain's merge request. I'm seeing other updates on the dfki branch.
Should these be merged too ?

typelib, utilrb:
merged all dfki patches on master. This was a plain fast-forward.

orogen: did
git checkout toolchain-dfki (dfki's master)
git merge -s ours master ( vanish our evil ros/cmake updates)
git checkout master
git merge toolchain-dfki
git push origin master

...That would have been easier with a 'theirs' merge strategy...

Non-orogen maintainers need to branch from the current master to propose
updates, submit a merge request through gitorious, and send an email to the
mailing list. Sylvain, typlib/util*/orogen's master is all yours for
merging/pushing.

Peter

Updates of master branches

On 11/16/2010 05:39 PM, Peter Soetens wrote:
> I am in the process of pushing 'stuff' to the master branches in order to pave
> the road to the 2.2.0 release. This is what you can find on gitorious:
>
> RTT:
> merged Sylvain's merge request. I'm seeing other updates on the dfki branch.
> Should these be merged too ?
They are simple enough (I think). If you prefer, I can send a merge request.

> Non-orogen maintainers need to branch from the current master to propose
> updates, submit a merge request through gitorious, and send an email to the
> mailing list. Sylvain, typlib/util*/orogen's master is all yours for
> merging/pushing.
Thanks. I appreciate it.

I'll push to master all the pending changes I have in stock for orogen
and typelib. They should fix the issues you had with TAO.