Skip to content
Snippets Groups Projects
Commit 5c0433d6 authored by Iustin Pop's avatar Iustin Pop
Browse files

Merge branch 'stable-2.0' into stable-2.1


* stable-2.0:
  Update NEWS file and release Ganeti 2.0.5
  Security issue: add validation of script names
  Move the hooks file mask into constants.py
  Improve LUQueryNodes for lockless case
  Ship rapi.rst/rapi.html in the dist archive

Conflicts:
	Makefile.am    (reverted, not needed)
	NEWS           (simple fix for RST-ification)
	configure.ac   (reverted, not needed)
	lib/backend.py (adapted to new RPC result style)

Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents 5bc556dd e5823b7e
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment