The Open Compute Project

Merge lp://staging/~jeffmarcom/opencompute/update-intro-message into lp://staging/opencompute/checkbox

  1. update-intro-message
  2. Merge into checkbox
Proposed by Jeff Marcom
Status: Merged
Approved by: Jeff Marcom
Approved revision: 2151
Merged at revision: 2150
Proposed branch: lp://staging/~jeffmarcom/opencompute/update-intro-message
Merge into: lp://staging/opencompute/checkbox
Diff against target: 40 lines (+14/-5)
2 files modified
debian/changelog (+1/-0)
plugins/intro_prompt.py (+13/-5)
To merge this branch: bzr merge lp://staging/~jeffmarcom/opencompute/update-intro-message
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+187144@code.staging.launchpad.net

Commit message

updates intro message for Checkbox OCP

Description of the change

This simply updates the intro message for Checkbox OCP.

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

Looks reasonable...

review: Approve
Revision history for this message
Jeff Lane  (bladernr) wrote :

Missing a commit message. Set one and reset to approve...

Revision history for this message
Jeff Marcom (jeffmarcom) wrote :

Attempt to merge into lp:opencompute/checkbox failed due to conflicts:

text conflict in debian/changelog

lp://staging/~jeffmarcom/opencompute/update-intro-message updated
2150. By Jeff Marcom

Updated intro prompt

Signed-off-by: Jeff Marcom <email address hidden>

2151. By Jeff Marcom

Updated changelog

Signed-off-by: Jeff Marcom <email address hidden>

Revision history for this message
Jeff Marcom (jeffmarcom) wrote :

rebase on lp:opencompute/checkbox trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches