Merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/zabbix/lucid-201002122335 into lp://qastaging/ubuntu/lucid/zabbix
Proposed by
James Westby
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/lucid/zabbix/lucid-201002122335 |
Merge into: | lp://qastaging/ubuntu/lucid/zabbix |
Diff against target: |
465 lines (+284/-0) (has conflicts) 15 files modified
debian/NEWS.Debian (+15/-0) debian/README.source (+10/-0) debian/changelog (+29/-0) debian/control (+4/-0) debian/po/cs.po (+4/-0) debian/po/es.po (+4/-0) debian/po/fr.po (+4/-0) debian/po/it.po (+4/-0) debian/po/pt.po (+4/-0) debian/po/ru.po (+4/-0) debian/po/sv.po (+4/-0) debian/po/templates.pot (+4/-0) debian/zabbix-frontend-php.links (+4/-0) debian/zabbix-server-mysql.zabbix-server.init (+95/-0) debian/zabbix-server-pgsql.zabbix-server.init (+95/-0) Text conflict in debian/NEWS.Debian Text conflict in debian/README.source Text conflict in debian/changelog Text conflict in debian/control Text conflict in debian/po/cs.po Text conflict in debian/po/es.po Text conflict in debian/po/fr.po Text conflict in debian/po/it.po Text conflict in debian/po/pt.po Text conflict in debian/po/ru.po Text conflict in debian/po/sv.po Text conflict in debian/po/templates.pot Text conflict in debian/zabbix-frontend-php.links Text conflict in debian/zabbix-server-mysql.zabbix-server.init Text conflict in debian/zabbix-server-pgsql.zabbix-server.init |
To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/zabbix/lucid-201002122335 |
Related bugs: |
To post a comment you must log in.
Unmerged revisions
- 24. By Fabio Tranchitella
-
Set Default-Start to "2 3 4 5" and Default-Stop to "0 1 6" for all the init
scripts.
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/zabbix now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/zabbix/lucid-201002122335. A merge should be performed if necessary.