Merge remote-tracking branch 'origin' into cgen
This commit is contained in:
commit
e8a30591fa
45 changed files with 772 additions and 284 deletions
|
|
@ -190,6 +190,7 @@ INSERT INTO channels (name) VALUES ('maven');
|
|||
INSERT INTO channels (name) VALUES ('livecd');
|
||||
INSERT INTO channels (name) VALUES ('appliance');
|
||||
INSERT INTO channels (name) VALUES ('vm');
|
||||
INSERT INTO channels (name) VALUES ('image');
|
||||
|
||||
-- Here we track the build machines
|
||||
-- each host has an entry in the users table also
|
||||
|
|
@ -788,6 +789,8 @@ insert into archivetypes (name, description, extensions) values ('so', 'Shared l
|
|||
insert into archivetypes (name, description, extensions) values ('txt', 'Text file', 'txt');
|
||||
insert into archivetypes (name, description, extensions) values ('vhd', 'Hyper-V image', 'vhd');
|
||||
insert into archivetypes (name, description, extensions) values ('wsf', 'Windows script file', 'wsf');
|
||||
insert into archivetypes (name, description, extensions) values ('box', 'Vagrant Box Image', 'box');
|
||||
insert into archivetypes (name, description, extensions) values ('raw-xz', 'xz compressed raw disk image', 'raw.xz');
|
||||
|
||||
|
||||
-- Do we want to enforce a constraint that a build can only generate one
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue