Merge branch 'devel-2.5'
authorGuido Trotter <ultrotter@google.com>
Thu, 15 Sep 2011 13:10:00 +0000 (14:10 +0100)
committerGuido Trotter <ultrotter@google.com>
Thu, 15 Sep 2011 13:40:01 +0000 (14:40 +0100)
* devel-2.5: (33 commits)
  htools: remove dead code
  hail: don't select the primary as new secondary
  hail: add an extra safety check in relocate
  Fix RAPI documentation for gnt-instance console
  Add SPICE compression and streaming options
  Add SPICE support to gnt-instance console
  Make KVM use the QXL vga driver with SPICE
  Use a loop to check SPICE parameters dependency
  import: Fix a logic error due to missing "not"
  import: Make sure the disk_dump path is in EXPORT_DIR
  Switch other commonprefix to IsBelowDir
  utils: Introduce IsBelowDir
  Fixed a typo in gnt_cluster.py
  Added password for SPICE sessions
  Draft implementation of QMP connection
  Pylint fixes for autogenerated files
  Version bump for 2.5.0~beta3
  Makefile: Use $(LN_S) instead of “ln -s”
  Fixes to errors/warnings raised by pylint 0.24
  PEP8 for QA
  ...

Conflicts:
Makefile.am
          - preserve both changes
lib/rapi/rlib2.py
          - keep master version

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>

14 files changed:
1  2 
Makefile.am
autotools/build-bash-completion
configure.ac
doc/rapi.rst
lib/cmdlib.py
lib/constants.py
lib/hypervisor/hv_base.py
lib/hypervisor/hv_kvm.py
lib/objects.py
lib/opcodes.py
lib/rapi/baserlib.py
lib/rapi/connector.py
lib/rapi/rlib2.py
lib/utils/__init__.py

diff --cc Makefile.am
@@@ -769,10 -768,17 +772,21 @@@ lint_python_code = 
        $(DOCPP) \
        $(PYTHON_BOOTSTRAP)
  
 +standalone_python_modules = \
 +      lib/rapi/client.py \
 +      tools/ganeti-listrunner
 +
+ pep8_python_code = \
+       ganeti \
+       ganeti/http/server.py \
+       $(dist_sbin_SCRIPTS) \
+       $(dist_tools_PYTHON) \
+       $(pkglib_python_scripts) \
+       $(BUILD_BASH_COMPLETION) \
+       $(DOCPP) \
+       $(PYTHON_BOOTSTRAP) \
+       qa
  test/daemon-util_unittest.bash: daemons/daemon-util
  
  test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
@@@ -246,14 -241,9 +246,14 @@@ class CompletionWriter
  
      for opt in opts:
        # While documented, these variables aren't seen as public attributes by
-       # pylint. pylint: disable-msg=W0212
+       # pylint. pylint: disable=W0212
        opt.all_names = sorted(opt._short_opts + opt._long_opts)
  
 +      invalid = list(itertools.ifilterfalse(_OPT_NAME_RE.match, opt.all_names))
 +      if invalid:
 +        raise Exception("Option names don't match regular expression '%s': %s" %
 +                        (_OPT_NAME_RE.pattern, utils.CommaJoin(invalid)))
 +
    def _FindFirstArgument(self, sw):
      ignore = []
      skip_one = []
diff --cc configure.ac
Simple merge
diff --cc doc/rapi.rst
Simple merge
diff --cc lib/cmdlib.py
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/objects.py
Simple merge
diff --cc lib/opcodes.py
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge