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)
commit0ac7c5bfb04bef200943dc8d0155edd9c9666d47
treec20ad5dbcc946dbaa3ef67b6048be050afec0647
parentf38a3e3e02f263552f6a9790e4bbdd2c440897f8
parentb5f3cca8c663c626e3209fc05f510037d9d4fdb4
Merge branch 'stable-2.12' into stable-2.13

* 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>
lib/cmdlib/cluster.py
test/py/cmdlib/cluster_unittest.py