Merge lp://staging/~knome/config/planet-ubuntu into lp://staging/~planet-ubuntu/config/main
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~knome/config/planet-ubuntu |
| Merge into: | lp://staging/~planet-ubuntu/config/main |
| Diff against target: |
2133 lines (+528/-659) (has conflicts) 2 files modified
config.ini (+299/-659) config_old.ini (+229/-0) Text conflict in config.ini Conflict adding file heads/amjjawad.png. Moved existing file to heads/amjjawad.png.moved. Conflict adding file heads/carla-sella.png. Moved existing file to heads/carla-sella.png.moved. Conflict adding file heads/mbruzek.png. Moved existing file to heads/mbruzek.png.moved. Conflict adding file heads/paulw2u.png. Moved existing file to heads/paulw2u.png.moved. Path conflict: heads/rpadovani.png / <deleted> Conflict adding file heads/sgclark.png. Moved existing file to heads/sgclark.png.moved. Conflict adding file heads/snwh.png. Moved existing file to heads/snwh.png.moved. Conflict adding file heads/teward.png. Moved existing file to heads/teward.png.moved. Conflict adding file heads/uflogo.png. Moved existing file to heads/uflogo.png.moved. Conflict adding file heads/wxl.png. Moved existing file to heads/wxl.png.moved. |
| To merge this branch: | bzr merge lp://staging/~knome/config/planet-ubuntu |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Scott Ritchie | Needs Fixing | ||
| Daniel Holbach | Needs Fixing | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-01-23.
Commit message
* Create config_old.ini to hold (temporarily) removed feeds from:
- People who aren't Ubuntu members
- People who want their feed to be disabled for their hiatus
- Sites that do not have content, or return a HTTP error
* Drop sites that clearly do not exist any more in any level
* Add sponsors to some team blogs
* Move some teams blogs to the team blogs listing
* Fix all nicks to point to existing Launchpad usernames
* Fix some feed URLs
* Improve the instructions
Description of the change
* Create config_old.ini to hold (temporarily) removed feeds from:
- People who aren't Ubuntu members
- People who want their feed to be disabled for their hiatus
- Sites that do not have content, or return a HTTP error
* Drop sites that clearly do not exist any more in any level
* Add sponsors to some team blogs
* Move some teams blogs to the team blogs listing
* Fix all nicks to point to existing Launchpad usernames
* Fix some feed URLs
* Improve the instructions
| Pasi Lallinaho (knome) wrote | # |
| Daniel Holbach (dholbach) wrote | # |
Reviewed until line 385 of the diff. Can anyone else have a look as well?