| commit | ea59ccd22c3957f9ef8c7828b5c1e778ab35b302 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 6 Jan 2011 21:14:12 +0000 (6 19:14 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 6 Jan 2011 21:14:12 +0000 (6 19:14 -0200) | ||
| tree | 286768b354cd4b14fa59f019847e5d611e272064 | treesnapshot (tar.gz zip) |
| parent | 5e10257364dd653cae26eb61b699f8562f445d4d | commitdiff |
| parent | 7572150c189c6553c2448334116ab717680de66d | commitdiff |
Merge commit '7572150c189c6553c2448334116ab717680de66d' into upstream-merge
* commit '7572150c189c6553c2448334116ab717680de66d':
vnc/spice: add set_passwd monitor command.
vnc: support password expire
vnc: auth reject cleanup
spice: add qmp 'query-spice' and hmp 'info spice' commands.
spice: connection events.
Conflicts:
hmp-commands.hx
monitor.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '7572150c189c6553c2448334116ab717680de66d':
vnc/spice: add set_passwd monitor command.
vnc: support password expire
vnc: auth reject cleanup
spice: add qmp 'query-spice' and hmp 'info spice' commands.
spice: connection events.
Conflicts:
hmp-commands.hx
monitor.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| hmp-commands.hx | diff1 | diff2 | blobhistory |
| monitor.c | diff1 | diff2 | blobhistory |