Merge lp://staging/~braiampe/launchpad-gm-scripts/bugsquad-replies.xml into lp://staging/launchpad-gm-scripts
Proposed by
Braiam Peguero
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Brian Murray | ||||
Proposed branch: | lp://staging/~braiampe/launchpad-gm-scripts/bugsquad-replies.xml | ||||
Merge into: | lp://staging/launchpad-gm-scripts | ||||
Diff against target: |
30217 lines (+29171/-0) (has conflicts) 199 files modified
.bzr-builddeb/default.conf (+2/-0) .bzrignore (+9/-0) GPL-3 (+676/-0) README (+115/-0) TODO (+14/-0) bug-dashboard/bug-dashboard.cron (+15/-0) bug-dashboard/generate-bug-dashboard.py (+121/-0) bug-dashboard/ml-important-bugs.py (+107/-0) bug-dashboard/release-nominated-to-json.py (+81/-0) bug-dashboard/release-targetted-to-json.py (+71/-0) bug-parsers/check-needs-packaging (+128/-0) bug-report-framework/README (+20/-0) bug-report-framework/bugs-since-sometime.py (+169/-0) bug-report-framework/bugtrackers.html (+12342/-0) bug-report-framework/package-bugs-gravity.py (+139/-0) bug-report-framework/package-bugs-numcommentsgt5.py (+90/-0) bug-report-framework/tagged-bug-tasks.py (+176/-0) bug-report-framework/team-assigned-bug-tasks.py (+182/-0) bug-report-framework/team-reported-bug-tasks.py (+108/-0) bug-report-framework/template.html (+74/-0) bug-teams/README (+3/-0) bug-teams/bugcontrol-new-member-announce.txt (+17/-0) bugs-mailinglist/body-searching (+89/-0) bugs-mailinglist/count-senders (+105/-0) bugs-mailinglist/ml-action-query.py (+233/-0) bugs-mailinglist/ml-fixes-report (+274/-0) bugs-mailinglist/ml-team-fixes-report (+249/-0) bugs-mailinglist/new-bug-description-search (+102/-0) bugs-mailinglist/tagged-bugs (+123/-0) bugs-mailinglist/triager-query (+114/-0) bugtrackers/debian-bug-search (+45/-0) common/lpl_common.py (+205/-0) debian/changelog (+102/-0) debian/compat (+1/-0) debian/control (+41/-0) debian/copyright (+41/-0) debian/pycompat (+1/-0) debian/rules (+8/-0) debian/ubuntu-qa-tools.examples (+1/-0) dl-ubuntu-test-iso/README (+132/-0) dl-ubuntu-test-iso/dl-ubuntu-test-iso (+653/-0) dl-ubuntu-test-iso/iso-ripper (+59/-0) doc/body-searching.1 (+23/-0) doc/check-needs-packaging.1 (+28/-0) doc/count-senders.1 (+23/-0) doc/debian-bug-search.1 (+19/-0) doc/dl-ubuntu-test-iso.1 (+148/-0) doc/hugday.1 (+34/-0) doc/iso-ripper.1 (+25/-0) doc/ml-fixes-report.1 (+25/-0) doc/ml-team-fixes-report.1 (+25/-0) doc/new-bug-description-search.1 (+23/-0) doc/tagged-bugs.1 (+23/-0) doc/triager-query.1 (+22/-0) editmoin/moin_aliases (+62/-0) examples/dl-ubuntu-test-iso.sample-cfg (+74/-0) examples/dl-ubuntu-test-iso.sample-cfg-hardy (+54/-0) gm-xml-files/bugsquad-replies.xml (+597/-0) hugday-tools/hugday (+426/-0) launchpadlib-scripts/bugsquad-membership.py (+91/-0) launchpadlib-scripts/crichton-update-bugs.py (+390/-0) launchpadlib-scripts/find-similar-bugs.py (+59/-0) launchpadlib-scripts/forward-bug-to-debian.py (+129/-0) launchpadlib-scripts/harvest-sru-candidates.py (+56/-0) launchpadlib-scripts/harvest-tagged-bugs.py (+50/-0) launchpadlib-scripts/package-removal-details.py (+56/-0) launchpadlib-scripts/packages-without-subscribers.py (+62/-0) launchpadlib-scripts/patch-subscriber.py (+112/-0) launchpadlib-scripts/process-bug-with-patch.py (+111/-0) launchpadlib-scripts/recent-bugs-packages.py (+47/-0) launchpadlib-scripts/release-nominations.py (+63/-0) launchpadlib-scripts/ubuntu-bugday.py (+98/-0) mutt-scripts/b-tool (+251/-0) package-bug-guidelines/README (+15/-0) package-bug-guidelines/bughelper.txt (+9/-0) package-bug-guidelines/ffmpeg.txt (+10/-0) package-bug-guidelines/kubuntu-restricted-extras.txt (+11/-0) package-bug-guidelines/linux-meta.txt (+18/-0) package-bug-guidelines/linux.txt (+24/-0) package-bug-guidelines/obsolete.txt (+13/-0) package-bug-guidelines/openoffice.txt (+13/-0) package-bug-guidelines/package-bug-guidelines.py (+54/-0) package-bug-guidelines/template.txt (+8/-0) package-bug-guidelines/ufw.txt (+5/-0) package-bug-guidelines/update-manager.txt (+5/-0) package-bug-guidelines/usplash.txt (+12/-0) package-bug-guidelines/xorg.txt (+171/-0) qadashboard/automatic_upgrades.py (+46/-0) qadashboard/boot_regressions.py (+50/-0) qadashboard/bugs_most_duplicates.py (+25/-0) qadashboard/bugs_most_users_affected.py (+25/-0) qadashboard/dash-recent-bugs-packages.py (+57/-0) qadashboard/desktop_tests.py (+47/-0) qadashboard/generate_data.py (+34/-0) qadashboard/hw_cert.py (+33/-0) qadashboard/iso_testing.py (+44/-0) qadashboard/mago_2d_tests.py (+85/-0) qadashboard/mago_tests.py (+30/-0) qadashboard/mago_unity_tests.py (+90/-0) qadashboard/packages_with_most_bugs_recently.py (+204/-0) qadashboard/qadashboard_html.py (+96/-0) qadashboard/qadashboard_utils.py (+111/-0) qadashboard/regression_tracker.py (+28/-0) qadashboard/run_report.sh (+55/-0) qadashboard/server_tests.py (+45/-0) responses/40-byte-varlogdistupgrade (+15/-0) responses/assign-package (+30/-0) responses/check-patch-comment.py (+80/-0) responses/collect-it (+19/-0) responses/hardware-error (+17/-0) responses/is-duplicate (+28/-0) responses/please-forward-to-debian (+14/-0) responses/security/bug-status (+37/-0) responses/security/in-english (+15/-0) responses/security/in-universe (+15/-0) responses/security/in-universe-with-full-upstream-patches (+15/-0) responses/security/is-dpkg-failure (+12/-0) responses/security/is-eol (+66/-0) responses/security/is-faq (+39/-0) responses/security/is-nonsecurity-private (+13/-0) responses/security/is-question (+15/-0) responses/security/is-timedout (+15/-0) responses/security/not-a-bug (+23/-0) responses/security/not-private (+23/-0) responses/security/not-security (+15/-0) responses/security/not-security-without-comment (+12/-0) responses/security/pubhist (+53/-0) responses/security/reassign.py (+101/-0) responses/security/recursive-unsub-unsec (+48/-0) responses/security/sub-security (+44/-0) responses/security/unlinkcves (+19/-0) responses/security/unsubscribe-me (+18/-0) responses/short-read-in-buffer-copy (+23/-0) responses/sound-bug (+19/-0) responses/stock-reply (+130/-0) responses/translation-needed (+15/-0) responses/uncheck-patch-comment.py (+71/-0) responses/update-bug (+188/-0) responses/use-storage-symptom (+19/-0) security-tools/bin-details (+82/-0) security-tools/compare-lp-builds (+194/-0) security-tools/compare-versions (+91/-0) security-tools/fetch-buildlogs (+135/-0) security-tools/fetch-debdiff (+72/-0) security-tools/find-bin-overrides (+122/-0) security-tools/hunt-crash (+130/-0) security-tools/kernel-abi-check (+150/-0) security-tools/live-api (+42/-0) security-tools/lp_info.py (+167/-0) security-tools/lpmad (+58/-0) security-tools/ls-ppa (+53/-0) security-tools/mbf (+53/-0) security-tools/mugshot (+31/-0) security-tools/rpm-spec-patches-to-series (+18/-0) security-tools/unembargo (+119/-0) setup.py (+32/-0) sru-report-tools/generate-thanks (+77/-0) sru-report-tools/get_installed_bins (+26/-0) sru-report-tools/lookup-irc-nick (+30/-0) sru-report-tools/report_updates (+219/-0) sru-report-tools/save-email-addresses (+57/-0) vm-tools/README (+367/-0) vm-tools/kvm-sound (+4/-0) vm-tools/libvm.sh (+216/-0) vm-tools/qcow-mount (+42/-0) vm-tools/qcow-umount (+34/-0) vm-tools/update-virtnet (+61/-0) vm-tools/vm-clone (+499/-0) vm-tools/vm-cmd (+187/-0) vm-tools/vm-emulator (+44/-0) vm-tools/vm-iso (+174/-0) vm-tools/vm-list (+61/-0) vm-tools/vm-modify (+75/-0) vm-tools/vm-new (+449/-0) vm-tools/vm-remove (+137/-0) vm-tools/vm-repo (+105/-0) vm-tools/vm-revert-packages (+16/-0) vm-tools/vm-scp (+212/-0) vm-tools/vm-start (+206/-0) vm-tools/vm-stop (+189/-0) vm-tools/vm-use-snapshots (+150/-0) vm-tools/vm-view (+76/-0) vm-tools/vmbuilder-extras/README (+5/-0) vm-tools/vmbuilder-extras/distros/debian/etc/vmbuilder/debian/dapper_fstab.tmpl (+10/-0) vm-tools/vmbuilder-extras/distros/debian/etc/vmbuilder/debian/dapper_fstab_fsimage.tmpl (+10/-0) vm-tools/vmbuilder-extras/distros/debian/etc/vmbuilder/debian/devicemap.tmpl (+3/-0) vm-tools/vmbuilder-extras/distros/debian/etc/vmbuilder/debian/etc_hosts.tmpl (+10/-0) vm-tools/vmbuilder-extras/distros/debian/etc/vmbuilder/debian/interfaces.tmpl (+22/-0) vm-tools/vmbuilder-extras/distros/debian/etc/vmbuilder/debian/kernelimg.tmpl (+8/-0) vm-tools/vmbuilder-extras/distros/debian/etc/vmbuilder/debian/locale.tmpl (+1/-0) vm-tools/vmbuilder-extras/distros/debian/etc/vmbuilder/debian/nostart-policy-rc.d.tmpl (+18/-0) vm-tools/vmbuilder-extras/distros/debian/etc/vmbuilder/debian/sources.list.tmpl (+5/-0) vm-tools/vmbuilder-extras/distros/debian/plugins/debian/__init__.py (+20/-0) vm-tools/vmbuilder-extras/distros/debian/plugins/debian/distro.py (+162/-0) vm-tools/vmbuilder-extras/distros/debian/plugins/debian/lenny.py (+325/-0) vm-tools/vmbuilder-extras/distros/debian/plugins/debian/sid.py (+35/-0) vm-tools/vmbuilder-extras/distros/debian/plugins/debian/sqeeze.py (+36/-0) vm-tools/vmbuilder-extras/distros/debian/plugins/debian/suite.py (+34/-0) vm-tools/vmbuilder-extras/distros/debian/plugins/debian/wtf (+23/-0) Conflict adding file README. Moved existing file to README.moved. Conflict adding file TODO. Moved existing file to TODO.moved. |
||||
To merge this branch: | bzr merge lp://staging/~braiampe/launchpad-gm-scripts/bugsquad-replies.xml | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Murray | Disapprove | ||
Review via email:
|
Description of the change
Updated the bugsquad-
To post a comment you must log in.
Unmerged revisions
- 582. By Braiam Peguero
-
Updated stock responces.
- 581. By Marc Deslauriers
-
vm-tools/vm-clone: manually generate ssh host keys, as using
dpkg-reconfigure will start an ssh daemon on the host. - 580. By Brian Murray
-
responses: add in hardware-error response
- 579. By Brian Murray
-
crichton: stop tagging linux bugs regression-release
- 578. By Brian Murray
-
ml-fixes-report: add in oneiric
- 577. By Marc Deslauriers
-
responses/
security/ not-security: add a subject when replying so
bdmurray buys beer for the security team at UDS. - 576. By Kees Cook
-
add natty, remove karmic
- 575. By Brian Murray
-
crichton: remove VarLogDistupgra
deTermlog. gz in more situations - 574. By Jamie Strandboge
-
add responses/
security/ is-eol - 573. By Philip Muškovac
-
update release+1 testing response for oneiric
So bugsquad- replies. xml is actually part of ubuntu-qa-tools and not launchpad- gm-scripts and the merge proposal you've created is for launchpad- gm-scripts. I tried resubmitting the merge proposal about the right branch for you bug Launchpad oops'ed on me. I'm currently reviewing your diff though, http:// bazaar. launchpad. net/~braiampe/ launchpad- gm-scripts/ bugsquad- replies. xml/revision/ 582, and will likely download that and just manually patch the branch. So no further action is required on this merge proposal.