grahamc/hydra - Change DH3KNBAVOKMC2K7Q7L3CM5YBUL4TCLN3Q7D3BOYXWKXDT6FSGUXAC

Merge remote-tracking branch 'upstream/who-broke-builds' into upstream-master

Include information about who changed the build status in notification emails, and enable optional per-input notification of said committers.

Conflicts due to two branches modifying the database schema.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts: src/lib/Hydra/Schema/Jobsets.pm src/sql/upgrade-23.sql

Created by Shea Levy on October 15, 2013

DH3KNBAVOKMC2K7Q7L3CM5YBUL4TCLN3Q7D3BOYXWKXDT6FSGUXAC

Dependencies

In channels

upstream

main

Change contents

Deletion in src/lib/Hydra/Schema/Jobsets.pm at line 306 [4.1960]

B:BD[4.3136] → [3.1149:1291]

# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-10-08 13:06:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BjT60mlrN7bnljqCMHbPEw

Solving an order conflict in src/lib/Hydra/Schema/Jobsets.pm at line 306 [4.1960]
[2.1961]
[5.22627]

File deletion: upgrade-23.sql

BF:BFD[6.3004] → [7.516:554]

BF:BFD[7.554] → [7.277:277]

B:BD[7.277] → [3.1941:2102]

alter table JobsetInputs add column emailResponsible integer not null default 0;
alter table BuildInputs add column emailResponsible integer not null default 0;

File addition: upgrade-24.sql (----------)

[6.3004]

alter table JobsetInputs add column emailResponsible integer not null default 0;
alter table BuildInputs add column emailResponsible integer not null default 0;