diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-11-12 13:09:19 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-11-12 13:09:19 +0100 |
commit | 76ba2eff4297cfc03e80d966cec518f03c5a111d (patch) | |
tree | 2c5abbf14f96a772c251e318c3072d54e5758cc0 /d-i-preseed-cfgs | |
parent | 333ea0b609fca122193362f08e4933bde9d0c332 (diff) | |
parent | 64c512d5bfbe8fb6716a540bc97587bd3b5d590f (diff) | |
download | jenkins.debian.net-76ba2eff4297cfc03e80d966cec518f03c5a111d.tar.xz |
Merge branch 'master' of git://git.debian.org/git/qa/jenkins.debian.net
Diffstat (limited to 'd-i-preseed-cfgs')
-rw-r--r-- | d-i-preseed-cfgs/debian-edu_wheezy_main-server_preseed.cfg (renamed from d-i-preseed-cfgs/debian-edu_wheezy-test_main-server_preseed.cfg) | 0 | ||||
-rw-r--r-- | d-i-preseed-cfgs/debian-edu_wheezy_minimal_preseed.cfg (renamed from d-i-preseed-cfgs/debian-edu_wheezy-test_minimal_preseed.cfg) | 0 | ||||
l--------- | d-i-preseed-cfgs/debian_jessie_daily_kfreebsd_preseed.cfg | 1 | ||||
l--------- | d-i-preseed-cfgs/debian_wheezy_daily_kfreebsd_preseed.cfg | 1 |
4 files changed, 2 insertions, 0 deletions
diff --git a/d-i-preseed-cfgs/debian-edu_wheezy-test_main-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_wheezy_main-server_preseed.cfg index 1adffcf9..1adffcf9 100644 --- a/d-i-preseed-cfgs/debian-edu_wheezy-test_main-server_preseed.cfg +++ b/d-i-preseed-cfgs/debian-edu_wheezy_main-server_preseed.cfg diff --git a/d-i-preseed-cfgs/debian-edu_wheezy-test_minimal_preseed.cfg b/d-i-preseed-cfgs/debian-edu_wheezy_minimal_preseed.cfg index 7a6bf7d6..7a6bf7d6 100644 --- a/d-i-preseed-cfgs/debian-edu_wheezy-test_minimal_preseed.cfg +++ b/d-i-preseed-cfgs/debian-edu_wheezy_minimal_preseed.cfg diff --git a/d-i-preseed-cfgs/debian_jessie_daily_kfreebsd_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_daily_kfreebsd_preseed.cfg new file mode 120000 index 00000000..f5c7678a --- /dev/null +++ b/d-i-preseed-cfgs/debian_jessie_daily_kfreebsd_preseed.cfg @@ -0,0 +1 @@ +debian_sid_daily_kfreebsd_preseed.cfg
\ No newline at end of file diff --git a/d-i-preseed-cfgs/debian_wheezy_daily_kfreebsd_preseed.cfg b/d-i-preseed-cfgs/debian_wheezy_daily_kfreebsd_preseed.cfg new file mode 120000 index 00000000..f5c7678a --- /dev/null +++ b/d-i-preseed-cfgs/debian_wheezy_daily_kfreebsd_preseed.cfg @@ -0,0 +1 @@ +debian_sid_daily_kfreebsd_preseed.cfg
\ No newline at end of file |