Merge branch 'devel-2.6'

* devel-2.6:
  ensure-dirs: Fix permissions on master socket
  Update security document for version 2.6
  Update NEWS and bump version to 2.6.1
  Text.hs: update field lists in parseData comments

Conflicts:
	NEWS: Trivial
	lib/tools/ensure_dirs.py: constant moved to pathutils

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

diff --cc NEWS
index f9b8a72,1d03ade..87e43d7
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,17 -2,43 +2,54 @@@ New
  ====
  
  
 +Version 2.7.0 beta0
 +-------------------
 +
 +*(unreleased)*
 +
 +- ``gnt-instance batch-create`` has been changed to use the bulk create
 +  opcode from Ganeti. This lead to incompatible changes in the format of
 +  the JSON file. It's now not a custom dict anymore but a dict
 +  compatible with the ``OpInstanceCreate`` opcode.
 +
 +
+ Version 2.6.1
+ -------------
+ 
+ *(Released Fri, 12 Oct 2012)*
+ 
+ A small bugfix release.
+ 
+ Fix double use of PRIORITY_OPT in gnt-node migrate, that would make the
+ command unusable.
+ 
+ Commands that issue many jobs don't fail anymore just because some jobs
+ take so long that other jobs are archived.
+ 
+ Failures during gnt-instance reinstall are reflected by the exit status.
+ 
+ Issue 190 fixed. Check for DRBD in cluster verify is enabled only when
+ DRBD is enabled.
+ 
+ When always_failover is set, --allow-failover is not required in migrate
+ commands anymore.
+ 
+ bash_completion works even if extglob is disabled
+ 
+ Fix bug with locks that made failover for RDB-based instances fail.
+ 
+ Fix bug in non-mirrored instance allocation that would make Ganeti
+ choose a random node instead of one based on the allocator metric.
+ 
+ Support for newer versions of pylint and pep8.
+ 
+ Hail doesn't fail anymore when trying to add an instance of type
+ 'file', 'sharedfile' or 'rbd'.
+ 
+ Add new Makefile target to rebuild the whole dist, so that all files are
+ included.
+ 
+ 
  Version 2.6.0
  -------------
  

diff --cc configure.ac
Simple merge

diff --cc htools/Ganeti/HTools/Text.hs
Simple merge

diff --cc lib/tools/ensure_dirs.py
index 09655cc,868e36c..699a1d1
--- 1/lib/tools/ensure_dirs.py
--- 2/lib/tools/ensure_dirs.py
+++ b/lib/tools/ensure_dirs.py
@@@ -151,41 -148,41 +151,41 @@@ def GetPaths()
    ss = ssconf.SimpleStore()
    for ss_path in ss.GetFileList():
      paths.append((ss_path, FILE, constants.SS_FILE_PERMS,
 -                  getent.noded_uid, 0, False))
 +                  getent.noded_uid, getent.noded_gid, False))
  
    paths.extend([
 -    (constants.QUEUE_DIR, DIR, 0700, getent.masterd_uid,
 +    (pathutils.QUEUE_DIR, DIR, 0700, getent.masterd_uid,
       getent.masterd_gid),
 -    (constants.QUEUE_DIR, QUEUE_DIR, 0600, getent.masterd_uid,
 +    (pathutils.QUEUE_DIR, QUEUE_DIR, 0600, getent.masterd_uid,
       getent.masterd_gid),
 -    (constants.JOB_QUEUE_LOCK_FILE, FILE, 0600,
 +    (pathutils.JOB_QUEUE_LOCK_FILE, FILE, 0600,
       getent.masterd_uid, getent.masterd_gid, False),
 -    (constants.JOB_QUEUE_SERIAL_FILE, FILE, 0600,
 +    (pathutils.JOB_QUEUE_SERIAL_FILE, FILE, 0600,
       getent.masterd_uid, getent.masterd_gid, False),
 -    (constants.JOB_QUEUE_VERSION_FILE, FILE, 0600,
 +    (pathutils.JOB_QUEUE_VERSION_FILE, FILE, 0600,
       getent.masterd_uid, getent.masterd_gid, False),
 -    (constants.JOB_QUEUE_ARCHIVE_DIR, DIR, 0700,
 +    (pathutils.JOB_QUEUE_ARCHIVE_DIR, DIR, 0700,
       getent.masterd_uid, getent.masterd_gid),
      (rapi_dir, DIR, 0750, getent.rapi_uid, getent.masterd_gid),
 -    (constants.RAPI_USERS_FILE, FILE, 0640, getent.rapi_uid,
 +    (pathutils.RAPI_USERS_FILE, FILE, 0640, getent.rapi_uid,
       getent.masterd_gid, False),
 -    (constants.RUN_GANETI_DIR, DIR, 0775, getent.masterd_uid,
 +    (pathutils.RUN_DIR, DIR, 0775, getent.masterd_uid,
       getent.daemons_gid),
 -    (constants.SOCKET_DIR, DIR, 0750, getent.masterd_uid,
 +    (pathutils.SOCKET_DIR, DIR, 0750, getent.masterd_uid,
       getent.daemons_gid),
-     (pathutils.MASTER_SOCKET, FILE, 0770, getent.masterd_uid,
 -    (constants.MASTER_SOCKET, FILE, 0660, getent.masterd_uid,
++    (pathutils.MASTER_SOCKET, FILE, 0660, getent.masterd_uid,
       getent.daemons_gid, False),
 -    (constants.BDEV_CACHE_DIR, DIR, 0755, getent.noded_uid,
 +    (pathutils.BDEV_CACHE_DIR, DIR, 0755, getent.noded_uid,
       getent.masterd_gid),
 -    (constants.UIDPOOL_LOCKDIR, DIR, 0750, getent.noded_uid,
 +    (pathutils.UIDPOOL_LOCKDIR, DIR, 0750, getent.noded_uid,
       getent.masterd_gid),
 -    (constants.DISK_LINKS_DIR, DIR, 0755, getent.noded_uid,
 +    (pathutils.DISK_LINKS_DIR, DIR, 0755, getent.noded_uid,
       getent.masterd_gid),
 -    (constants.CRYPTO_KEYS_DIR, DIR, 0700, getent.noded_uid,
 +    (pathutils.CRYPTO_KEYS_DIR, DIR, 0700, getent.noded_uid,
       getent.masterd_gid),
 -    (constants.IMPORT_EXPORT_DIR, DIR, 0755, getent.noded_uid,
 +    (pathutils.IMPORT_EXPORT_DIR, DIR, 0755, getent.noded_uid,
       getent.masterd_gid),
 -    (constants.LOG_DIR, DIR, 0770, getent.masterd_uid,
 +    (pathutils.LOG_DIR, DIR, 0770, getent.masterd_uid,
       getent.daemons_gid),
      (masterd_log, FILE, 0600, getent.masterd_uid, getent.masterd_gid,
       False),