projects
/
ganeti-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0c401de
9614023
)
Merge branch 'stable-2.11' into stable-2.12
author
Oleg Ponomarev
<oponomarev@google.com>
Wed, 11 Nov 2015 16:04:40 +0000
(17:04 +0100)
committer
Oleg Ponomarev
<oponomarev@google.com>
Wed, 11 Nov 2015 17:07:01 +0000
(18:07 +0100)
* stable-2.11
(no changes)
* stable-2.10
Remove -X from hspace man page
Make htools tolerate missing "dtotal" and "dfree" on luxi
Signed-off-by: Oleg Ponomarev <oponomarev@google.com>
Reviewed-by: Liza Velden <velden@google.com>
Trivial merge