Merge branch 'master' into type-emulator

2011-09-19 00:53:15 +02:00 · 2011-09-19 00:53:15 +02:00 · a56a6604be
commit a56a6604be
parent 9e99d420b6 f8c49708cf
48 changed files with 0 additions and 0 deletions
--- a/contrib/examples/nico/conf/type/__nico_afs/files/afs/CellServDB
+++ b/contrib/examples/nico/conf/type/__nico_afs/files/afs/CellServDB
--- a/contrib/examples/nico/conf/type/__nico_afs/files/afs/ThisCell
+++ b/contrib/examples/nico/conf/type/__nico_afs/files/afs/ThisCell
--- a/contrib/examples/nico/conf/type/__nico_afs/files/krb5/krb5.conf
+++ b/contrib/examples/nico/conf/type/__nico_afs/files/krb5/krb5.conf
--- a/contrib/examples/nico/conf/type/__nico_afs/files/ssh/JAS.pub
+++ b/contrib/examples/nico/conf/type/__nico_afs/files/ssh/JAS.pub
--- a/contrib/examples/nico/conf/type/__nico_afs/files/ssh/bugblue.pub
+++ b/contrib/examples/nico/conf/type/__nico_afs/files/ssh/bugblue.pub
--- a/contrib/examples/nico/conf/type/__nico_afs/files/ssh/docsteel.pub
+++ b/contrib/examples/nico/conf/type/__nico_afs/files/ssh/docsteel.pub
--- a/contrib/examples/nico/conf/type/__nico_afs/files/ssh/downhill.pub
+++ b/contrib/examples/nico/conf/type/__nico_afs/files/ssh/downhill.pub
--- a/contrib/examples/nico/conf/type/__nico_afs/files/ssh/sur5r@samsa.pub
+++ b/contrib/examples/nico/conf/type/__nico_afs/files/ssh/sur5r@samsa.pub
--- a/contrib/examples/nico/conf/type/__nico_afs/manifest
+++ b/contrib/examples/nico/conf/type/__nico_afs/manifest
--- a/contrib/examples/nico/conf/type/__nico_afs/singleton
+++ b/contrib/examples/nico/conf/type/__nico_afs/singleton
--- a/contrib/examples/nico/conf/type/__nico_desktop/files/hostname
+++ b/contrib/examples/nico/conf/type/__nico_desktop/files/hostname
--- a/contrib/examples/nico/conf/type/__nico_desktop/files/slim-preseed
+++ b/contrib/examples/nico/conf/type/__nico_desktop/files/slim-preseed
--- a/contrib/examples/nico/conf/type/__nico_desktop/manifest
+++ b/contrib/examples/nico/conf/type/__nico_desktop/manifest
--- a/contrib/examples/nico/conf/type/__nico_desktop/parameter/required
+++ b/contrib/examples/nico/conf/type/__nico_desktop/parameter/required
--- a/contrib/examples/nico/conf/type/__nico_desktop/singleton
+++ b/contrib/examples/nico/conf/type/__nico_desktop/singleton
--- a/contrib/examples/nico/conf/type/__nico_mpd/files/slim-preseed
+++ b/contrib/examples/nico/conf/type/__nico_mpd/files/slim-preseed
--- a/contrib/examples/nico/conf/type/__nico_mpd/manifest
+++ b/contrib/examples/nico/conf/type/__nico_mpd/manifest
--- a/contrib/examples/nico/conf/type/__nico_mpd/parameter/required
+++ b/contrib/examples/nico/conf/type/__nico_mpd/parameter/required
--- a/contrib/examples/nico/conf/type/__nico_mpd/singleton
+++ b/contrib/examples/nico/conf/type/__nico_mpd/singleton
--- a/contrib/examples/nico/conf/type/__nico_network/files/interfaces-eth0
+++ b/contrib/examples/nico/conf/type/__nico_network/files/interfaces-eth0
--- a/contrib/examples/nico/conf/type/__nico_network/files/interfaces-wlan0
+++ b/contrib/examples/nico/conf/type/__nico_network/files/interfaces-wlan0
--- a/contrib/examples/nico/conf/type/__nico_network/manifest
+++ b/contrib/examples/nico/conf/type/__nico_network/manifest
--- a/contrib/examples/nico/conf/type/__nico_network/parameter/required
+++ b/contrib/examples/nico/conf/type/__nico_network/parameter/required
--- a/contrib/examples/nico/conf/type/__nico_network/singleton
+++ b/contrib/examples/nico/conf/type/__nico_network/singleton
--- a/contrib/examples/nico/conf/type/__nico_nfs_client/files/slim-preseed
+++ b/contrib/examples/nico/conf/type/__nico_nfs_client/files/slim-preseed
--- a/contrib/examples/nico/conf/type/__nico_nfs_client/manifest
+++ b/contrib/examples/nico/conf/type/__nico_nfs_client/manifest
--- a/contrib/examples/nico/conf/type/__nico_nfs_client/singleton
+++ b/contrib/examples/nico/conf/type/__nico_nfs_client/singleton
--- a/contrib/examples/nico/conf/type/__nico_notebook/manifest
+++ b/contrib/examples/nico/conf/type/__nico_notebook/manifest
--- a/contrib/examples/nico/conf/type/__nico_notebook/singleton
+++ b/contrib/examples/nico/conf/type/__nico_notebook/singleton
--- a/contrib/examples/nico/conf/type/__nico_packages/manifest
+++ b/contrib/examples/nico/conf/type/__nico_packages/manifest
--- a/contrib/examples/nico/conf/type/__nico_packages/singleton
+++ b/contrib/examples/nico/conf/type/__nico_packages/singleton
--- a/contrib/examples/nico/conf/type/__nico_sudo/files/sudo-nico
+++ b/contrib/examples/nico/conf/type/__nico_sudo/files/sudo-nico
--- a/contrib/examples/nico/conf/type/__nico_sudo/manifest
+++ b/contrib/examples/nico/conf/type/__nico_sudo/manifest
--- a/contrib/examples/nico/conf/type/__nico_sudo/parameter/gencode
+++ b/contrib/examples/nico/conf/type/__nico_sudo/parameter/gencode
--- a/contrib/examples/nico/conf/type/__nico_sudo/parameter/manifest
+++ b/contrib/examples/nico/conf/type/__nico_sudo/parameter/manifest
--- a/contrib/examples/nico/conf/type/__nico_sudo/parameter/optional
+++ b/contrib/examples/nico/conf/type/__nico_sudo/parameter/optional
--- a/contrib/examples/nico/conf/type/__nico_sudo/parameter/required
+++ b/contrib/examples/nico/conf/type/__nico_sudo/parameter/required
--- a/contrib/examples/nico/conf/type/__nico_sudo/singleton
+++ b/contrib/examples/nico/conf/type/__nico_sudo/singleton
--- a/contrib/examples/nico/conf/type/__nico_tee/files/99-apt-nico
+++ b/contrib/examples/nico/conf/type/__nico_tee/files/99-apt-nico
--- a/contrib/examples/nico/conf/type/__nico_tee/files/hostname
+++ b/contrib/examples/nico/conf/type/__nico_tee/files/hostname
--- a/contrib/examples/nico/conf/type/__nico_tee/manifest
+++ b/contrib/examples/nico/conf/type/__nico_tee/manifest
--- a/contrib/examples/nico/conf/type/__nico_tee/singleton
+++ b/contrib/examples/nico/conf/type/__nico_tee/singleton
--- a/contrib/types_pending_inclusion/__package_zypper/README
+++ b/contrib/types_pending_inclusion/__package_zypper/README
--- a/contrib/types_pending_inclusion/__package_zypper/explorer/pkg_version
+++ b/contrib/types_pending_inclusion/__package_zypper/explorer/pkg_version
--- a/contrib/types_pending_inclusion/__package_zypper/gencode-remote
+++ b/contrib/types_pending_inclusion/__package_zypper/gencode-remote
--- a/contrib/types_pending_inclusion/__package_zypper/man.text
+++ b/contrib/types_pending_inclusion/__package_zypper/man.text
--- a/contrib/types_pending_inclusion/__package_zypper/parameter/optional
+++ b/contrib/types_pending_inclusion/__package_zypper/parameter/optional
--- a/contrib/types_pending_inclusion/__package_zypper/parameter/required
+++ b/contrib/types_pending_inclusion/__package_zypper/parameter/required