[libvirt] [PATCH] virsh: fix non-literal string format
Eric Blake
eblake at redhat.com
Tue Nov 9 23:05:52 UTC 2010
On 11/09/2010 04:03 PM, Eric Blake wrote:
> On 11/09/2010 02:06 PM, Laine Stump wrote:
>> I just pushed this under the trivial rule.
>>
>> These are in the newly added -V output.
>> ---
>> tools/virsh.c | 10 +++++-----
>> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> Admin note - Laine and I just rebased libvirt.org to fix up 'make
> syntax-check' by altering a botched commit message.
>
> If you happened to pull from libvirt.org during the one hour window
> where commit 0341fc9 was live, then you will see something like this the
> next time you pull:
>
> + 0341fc9...ff4a31d master -> origin/master (forced update)
>
> if you also see a merge commit, then simply running 'git rebase' will
> fix things up so that you're back in sync with the state of the latest
> upstream.
Clarification: your choice of 'git pull --rebase', or 'git pull && git
rebase origin'.
--
Eric Blake eblake at redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 619 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20101109/12798980/attachment-0001.sig>
More information about the libvir-list
mailing list