Merge branch 'stable-2.11' into stable-2.12
authorKlaus Aehlig <aehlig@google.com>
Mon, 18 May 2015 12:12:55 +0000 (14:12 +0200)
committerKlaus 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