Merge branch 'master' of https://github.com/camptocamp/puppet-bind

Conflicts:
	manifests/definitions/bind-mx.pp

1 files changed, 0 insertions, 27 deletions

diff --git a/manifests/definitions/bind-ns.pp b/manifests/definitions/bind-ns.pp
deleted file mode 100644
index 3d07aea..0000000
--- a/manifests/definitions/bind-ns.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-
-= Definition: bind::ns
-Creates an NS record.
-
-Arguments:
- *$zone*:  Bind::Zone name
- *$owner*: owner of the Resource Record
- *$host*:  target of the Resource Record
- *$ttl*:   Time to Live for the Resource Record. Optional.
-
-*/
-define bind::ns($ensure=present,
-    $zone,
-    $owner=false,
-    $host,
-    $ttl=false) {
-
-  bind::record {$name:
-    ensure => $ensure,
-    zone   => $zone,
-    owner  => $owner,
-    host   => $host,
-    ttl    => $ttl,
-    record_type => 'NS',
-  }
-}