projects
/
ganeti-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6d5a5d3
da9e44c
)
Merge branch 'stable-2.11' into stable-2.12
author
Klaus Aehlig
<aehlig@google.com>
Mon, 18 May 2015 12:12:55 +0000
(14:12 +0200)
committer
Klaus Aehlig
<aehlig@google.com>
Mon, 18 May 2015 12:22:42 +0000
(14:22 +0200)
* stable-2.11
(no changes)
* stable-2.10
Check for gnt-cluster before running gnt-cluster upgrade
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>
Trivial merge