commit bc30570681570807ae6f3f15b72cbf3a9b3539f5 Merge: 94d7ecd 7363cf6 Author: Klaus Aehlig <aeh...@google.com> Date: Mon May 18 10:09:13 2015 +0200
Merge branch 'stable-2.10' into stable-2.11 * stbale-2.10 Check for gnt-cluster before running gnt-cluster upgrade Signed-off-by: Klaus Aehlig <aeh...@google.com> -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores