Merge branch 'stable-2.12' into stable-2.13
authorHrvoje Ribicic <riba@google.com>
Mon, 15 Jun 2015 10:58:11 +0000 (12:58 +0200)
committerHrvoje Ribicic <riba@google.com>
Mon, 15 Jun 2015 11:10:25 +0000 (11:10 +0000)
* stable-2.12
  Fix tests for setting (shared) file storage directory
  Add missing call for setting shared file storage directory
  Update ganeti-luxid synopsis
  Update ganeti-mond synopsis
  Update ganeti-confd synopsis
  Update copyright statement

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

1  2 
lib/cmdlib/cluster.py
test/py/cmdlib/cluster_unittest.py

Simple merge
Simple merge