linaro-license-protection

Merge lp://qastaging/~gesha/linaro-license-protection/textile-view into lp://qastaging/~linaro-infrastructure/linaro-license-protection/textile-view

  1. textile-view
  2. Merge into textile-view
Proposed by Georgy Redkozubov
Status: Merged
Merged at revision: 141
Proposed branch: lp://qastaging/~gesha/linaro-license-protection/textile-view
Merge into: lp://qastaging/~linaro-infrastructure/linaro-license-protection/textile-view
Diff against target: 95 lines (+33/-7) (has conflicts)
2 files modified
license_protected_downloads/render_text_files.py (+20/-5)
license_protected_downloads/tests/test_render_text_files.py (+13/-2)
Text conflict in license_protected_downloads/render_text_files.py
To merge this branch: bzr merge lp://qastaging/~gesha/linaro-license-protection/textile-view
Reviewer Review Type Date Requested Status
Stevan Radaković Approve
Review via email: mp+129863@code.qastaging.launchpad.net

Description of the change

These revs add sorting to the list of paths based on pre-defined list of files to display and pep8 fixes.

To post a comment you must log in.
Revision history for this message
Milo Casagrande (milo) wrote :

Gesha, there are some conflicts in the merge. Can you please take a look?

Revision history for this message
Stevan Radaković (stevanr) wrote :

Yea I updated the target branch directly yesterday.. Just remove those two comment lines (since we've implemented exceptions already) and you can resolve.
Other then that, approve +1.

review: Approve

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