Project

General

Profile

Bug #4074

The rudder initial-vhost failed to merge correctly

Added by Matthieu CERDA over 6 years ago. Updated over 6 years ago.

Status:
Released
Priority:
1
Category:
-
Target version:
Severity:
User visibility:
Effort required:
Priority:

Description

The rudder initial-vhost failed to merge correctly on 2.8 and needs to be corrected.

Associated revisions

Revision c4eea22f (diff)
Added by Matthieu CERDA over 6 years ago

Fixes #4074: Fix the Apache vhost after a merge failure

Revision d3b85724 (diff)
Added by Matthieu CERDA over 6 years ago

Fixes #4074: Fix the Apache vhost after a merge failure

Revision abaf02a3
Added by Matthieu CERDA over 6 years ago

Merge pull request #348 from Kegeruneku/bug_4074/int/4074_fix_the_rudder_vhost_after_merge_failure

Fixes #4074: Fix the Apache vhost after a merge failure

Revision 8df7ea73
Added by Matthieu CERDA over 6 years ago

Merge pull request #348 from Kegeruneku/bug_4074/int/4074_fix_the_rudder_vhost_after_merge_failure

Fixes #4074: Fix the Apache vhost after a merge failure

History

#1

Updated by Matthieu CERDA over 6 years ago

  • Status changed from In progress to Pending technical review
  • Assignee changed from Matthieu CERDA to Jonathan CLARKE
  • % Done changed from 0 to 100
  • Pull Request set to https://github.com/Normation/rudder/pull/348/files

PR available

#2

Updated by Matthieu CERDA over 6 years ago

  • Status changed from Pending technical review to Pending release
#3

Updated by Matthieu CERDA over 6 years ago

#4

Updated by Matthieu CERDA over 6 years ago

  • Status changed from Pending release to Pending technical review

Since #3879, we introduced changes in the Rudder default vhost. A git rebasing glitch broke them (typo) and it needed to be corrected.

#5

Updated by Nicolas PERRON over 6 years ago

  • Status changed from Pending technical review to Pending release
#6

Updated by Vincent MEMBRÉ over 6 years ago

  • Status changed from Pending release to Released

This bug has been fixed in Rudder 2.8.0~beta1, which was released today.
Check out:

Also available in: Atom PDF