Project

General

Profile

Actions

Bug #5941

closed

Synchronize rudder-agent-thin patches with rudder-agent

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

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

Description

Since we introduced a lot of changes recently, they are not in sync anymore...

$ patch -d ../SPECS --forward -p1 < patches/rudder-agent-thin/0002-rudder-agent-to-rudder-agent-thin-spec.patch
patching file rudder-agent.spec
Hunk #4 FAILED at 76.
Hunk #6 FAILED at 190.
Hunk #7 FAILED at 206.
Hunk #9 succeeded at 361 (offset 3 lines).
Hunk #10 succeeded at 383 (offset 3 lines).
Hunk #11 succeeded at 407 (offset 3 lines).
Hunk #12 succeeded at 428 (offset 3 lines).
Hunk #13 succeeded at 657 (offset 8 lines).
Hunk #14 succeeded at 679 (offset 8 lines).
Hunk #15 succeeded at 726 with fuzz 1 (offset 8 lines).
Hunk #16 succeeded at 763 (offset 11 lines).
3 out of 16 hunks FAILED -- saving rejects to file rudder-agent.spec.rej

Let's update this :)

Actions #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
  • Target version set to 3.0.0~beta2
  • % Done changed from 0 to 100
  • Pull Request set to https://github.com/Normation/rudder-packages/pull/559
Actions #2

Updated by Matthieu CERDA over 6 years ago

  • Status changed from Pending technical review to Pending release

Applied in changeset packages:rudder-packages|commit:b450d3e08364b91043ab5938730135f6ce6ddfac.

Actions #3

Updated by Jonathan CLARKE over 6 years ago

Applied in changeset packages:rudder-packages|commit:ce00e2076e24bd1109850618e036380f030a51c8.

Actions #4

Updated by Vincent MEMBRÉ over 6 years ago

  • Status changed from Pending release to Released

This bug has been fixed in Rudder 3.0.0~beta2, which were these days.

Actions

Also available in: Atom PDF