projects
/
ganeti-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
94d7ecd
7363cf6
)
Merge branch 'stable-2.10' into stable-2.11
author
Klaus Aehlig
<aehlig@google.com>
Mon, 18 May 2015 08:09:13 +0000
(10:09 +0200)
committer
Klaus Aehlig
<aehlig@google.com>
Mon, 18 May 2015 10:35:48 +0000
(12:35 +0200)
* stbale-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