On Mon, Feb 03, 2014 at 02:32:27PM -0700, Eric Blake wrote:
On 01/23/2014 07:25 AM, Daniel P. Berrange wrote:
> Change d40861 removed the 'len' argument from the virStreamSend
> C level wrapper, but forgot to remove it from the python level
> wrapper.
>
> Reported-by: Robie Basak <robie.basak(a)canonical.com>
> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
> ---
> libvirt-override-virStream.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Hmm, you pushed this patch onto the release before 1.2.1; I had to push
a merge commit to get the master branch to include both this and the
release. I'm not sure why git let you push a non-fast-forward, unless
DV forgot to push the 1.2.1 tag to the master branch until after you had
already pushed this.
That is very odd - the commit dates all show a normal sequence of
committing. I can only imagine that perhaps we forgot to set the
"deny merge" bit in the git repo config and I wasn't up2date when
I pushed ? The git config looks OK right now, but I see you modified
it last night, so did you fix something ?
Daniel
--
|:
http://berrange.com -o-
http://www.flickr.com/photos/dberrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|:
http://entangle-photo.org -o-
http://live.gnome.org/gtk-vnc :|