Merge branch 'stable-2.7' into stable-2.8
authorGuido Trotter <ultrotter@google.com>
Fri, 24 May 2013 11:19:28 +0000 (13:19 +0200)
committerGuido Trotter <ultrotter@google.com>
Fri, 24 May 2013 11:26:10 +0000 (13:26 +0200)
commit328201a5b60e1ba8de380af7d39fbfc732afb614
tree6173eda09ba2fe3041611611051df70c9a97d081
parentfab0cf66e5315c18ab0f6a8f77c8292915dd8a13
parent75d25240dfec514962bdec3d3323453d68110790
Merge branch 'stable-2.7' into stable-2.8

* stable-2.7:
  Bump up version for 2.7.0~rc2 release
  Add NEWS entry for SO_PEERCRED fix
  Workaround missing SO_PEERCRED
  Add debugging clause to _ExpandCheckDisks error
  Mention hail network incompatibility in manpages
  Remove obsolete Debian-related documentation
  Update NEWS for 2.7.0 rc2
  Improve installation documentation
  Fix owner of the OS log dir

Conflicts:
lib/cmdlib.py: port to cmdlib/instance_storage.py
lib/tools/ensure_dirs.py: trivial

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
INSTALL
NEWS
configure.ac
doc/install.rst
lib/cmdlib/instance_storage.py
lib/netutils.py
lib/tools/ensure_dirs.py