Commit bccc3658 authored by Thomas Thrainer's avatar Thomas Thrainer
Browse files

Merge branch 'stable-2.10' into stable-2.11



* stable-2.10
  Postpone 2.10.4 release to May 15th
  Don't fail QA if submitting a job takes too long
  Revision bump for the 2.10.4 release
  Prepare NEWS file for 2.10.4 release

* stable-2.9
  On expanding jobs, extend reason trail
  Add LC_ALL=en_US.UTF-8 before running check-man-warnings

Conflicts:
	NEWS (take both additions)
	configure.ac (take the stable-2.11 version)
	lib/mcpu.py (take reason trail handling from stable-2.9)
Signed-off-by: default avatarThomas Thrainer <thomasth@google.com>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parents 9571c499 70000149
......@@ -1744,7 +1744,7 @@ man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.rst
trap 'echo auto-removing $@; rm $@' EXIT; \
$(PANDOC) -s -f rst -t man $< man/footer.rst | \
sed -e 's/\\@/@/g' > $@; \
if test -n "$(MAN_HAS_WARNINGS)"; then $(CHECK_MAN_WARNINGS) $@; fi; \
if test -n "$(MAN_HAS_WARNINGS)"; then LC_ALL=en_US.UTF-8 $(CHECK_MAN_WARNINGS) $@; fi; \
$(CHECK_MAN_DASHES) $@; \
trap - EXIT
......
......@@ -204,6 +204,19 @@ This was the first beta release of the 2.11 series. All important changes
are listed in the latest 2.11 entry.
Version 2.10.4
--------------
*(Released Thu, 15 May 2014)*
- Support restricted migration in hbal
- Fix for the --shared-file-storage-dir of gnt-cluster modify (issue 811)
- Fail in replace-disks if attaching disks fails (issue 814)
- Set IFF_ONE_QUEUE on created tap interfaces for KVM
- Small fixes and enhancements in the build system
- Various documentation fixes (e.g. issue 810)
Version 2.10.3
--------------
......
......@@ -211,9 +211,9 @@ def _SetBaseOpParams(src, defcomment, dst):
if not getattr(dst, opcodes_base.COMMENT_ATTR, None):
dst.comment = defcomment
# FIXME: extend reason trail, showing the derivedness
if not getattr(dst, constants.OPCODE_REASON, None):
dst.reason = getattr(src, constants.OPCODE_REASON, [])
if hasattr(src, constants.OPCODE_REASON):
dst.reason = getattr(dst, constants.OPCODE_REASON, [])
dst.reason.extend(getattr(src, constants.OPCODE_REASON, []))
def _ProcessResult(submit_fn, op, result):
......
......@@ -214,9 +214,9 @@ def _ExecuteJobSubmittingCmd(cmd):
result = qa_job_utils.ExecuteJobProducingCommand(cmd)
duration = qa_utils.TimedeltaToTotalSeconds(datetime.datetime.now() - start)
if duration > MAX_JOB_SUBMISSION_DURATION:
raise qa_error.Error(
"Executing '%s' took %f seconds, only %f are allowed" %
(cmd, duration, MAX_JOB_SUBMISSION_DURATION))
print(qa_logging.FormatWarning(
"Executing '%s' took %f seconds, a maximum of %f was expected" %
(cmd, duration, MAX_JOB_SUBMISSION_DURATION)))
return result
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment