On Mon, Mar 04, 2013 at 02:34:20AM -0800, Guido Trotter wrote: > On Mon, Mar 4, 2013 at 1:31 AM, Iustin Pop <[email protected]> wrote: > > On Fri, Mar 01, 2013 at 01:24:13PM -0800, Guido Trotter wrote: > >> commit 38f13f1c67f2af8c32222f2325d8774675c759df > >> Merge: 59c7551 ac84bef > >> Author: Guido Trotter <[email protected]> > >> Date: Fri Mar 1 13:23:26 2013 -0800 > >> > >> Merge branch 'devel-2.7' > >> > >> * devel-2.7: > >> Fix networks in _PrepareNicModifications() > >> Fix sphinx label namespace > >> Clarify use of move-instance with self-signed certificates > >> Remove early returns in network LUs > >> Fix HooksDict() in case of no tags > >> Add networks to _AllIDs() > >> Fix locking in LUNetworkConnect() > >> Fix networks in LUInstanceSetParams() > >> Fix another docstring typo > >> Locking fixes regarding Issue 324 > >> Fix small typo in a docstring > >> check-news: Ensure release date is within three days > >> > >> Signed-off-by: Guido Trotter <[email protected]> > > > > NACK. I have other changes pending on devel-2.7, and I will do a merge > > once those are in. > > > > ACK, no problem. I was merging because of a request, but if it's done > soonish it can wait some more. :)
I wanted to do the merge as well on Friday, but it was so empty that there was nooone to review my trivial patches (thanks btw!). I'll have the merge done today. iustin
