Send Netdot-devel mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Netdot-devel digest..."
Today's Topics:
1. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-26-g123c567 ([email protected])
2. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-27-g5926ecf ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 30 Nov 2012 09:25:32 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-26-g123c567
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netdot".
The branch, netdot-1.0 has been updated
via 123c5676f153bdc568a427256a770f403f16a739 (commit)
via 41f7b6ac708f56e76f74dd2d1c521c20270ba13b (commit)
from 22aecb91bcbec4179e9113a550fa89886d0366a9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 123c5676f153bdc568a427256a770f403f16a739
Author: Carlos Vicente <[email protected]>
Date: Fri Nov 30 12:25:24 2012 -0500
Correction to meta info to deal with newer and older versions of
SQL::Translator
diff --git a/etc/netdot.meta b/etc/netdot.meta
index b74f63e..7aaf2cd 100644
--- a/etc/netdot.meta
+++ b/etc/netdot.meta
@@ -106,7 +106,7 @@ $meta = {
isjoin => '0',
label => [ 'access', 'object_class', 'object_id' ],
primary_key => 'id',
- unique => [ [ ] ],
+ unique => [],
views => {
all => [
'access',
@@ -202,7 +202,7 @@ $meta = {
isjoin => '0',
label => [ 'tstamp', 'username', 'label' ],
primary_key => 'id',
- unique => [ [ ] ],
+ unique => [],
views => {
all => [
'tstamp',
@@ -6624,7 +6624,7 @@ $meta = {
'replacement',
],
primary_key => 'id',
- unique => [[ ]],
+ unique => [],
views => {
all => [
'order_field',
@@ -8490,7 +8490,7 @@ $meta = {
'zone',
],
primary_key => 'id',
- unique => [ [ ] ],
+ unique => [],
views => {
all => [
'tstamp',
commit 41f7b6ac708f56e76f74dd2d1c521c20270ba13b
Author: Carlos Vicente <[email protected]>
Date: Fri Nov 30 12:09:09 2012 -0500
Revert changes to netdot.meta
diff --git a/etc/netdot.meta b/etc/netdot.meta
index f14cb00..b74f63e 100644
--- a/etc/netdot.meta
+++ b/etc/netdot.meta
@@ -106,6 +106,7 @@ $meta = {
isjoin => '0',
label => [ 'access', 'object_class', 'object_id' ],
primary_key => 'id',
+ unique => [ [ ] ],
views => {
all => [
'access',
@@ -201,6 +202,7 @@ $meta = {
isjoin => '0',
label => [ 'tstamp', 'username', 'label' ],
primary_key => 'id',
+ unique => [ [ ] ],
views => {
all => [
'tstamp',
@@ -350,6 +352,7 @@ $meta = {
'interface',
],
primary_key => 'id',
+ unique => [],
views => {
all => [
'interface',
@@ -1732,6 +1735,7 @@ $meta = {
'contacttype'
],
primary_key => 'id',
+ unique => [],
views => {
all => [
'person',
@@ -3788,6 +3792,7 @@ $meta = {
'physaddr'
],
primary_key => 'id',
+ unique => [],
views => {
all => [
'interface',
@@ -6325,6 +6330,7 @@ $meta = {
'rr'
],
primary_key => 'id',
+ unique => [],
views => {
all => [
'cpu',
@@ -6618,6 +6624,7 @@ $meta = {
'replacement',
],
primary_key => 'id',
+ unique => [[ ]],
views => {
all => [
'order_field',
@@ -6932,6 +6939,7 @@ $meta = {
'rr'
],
primary_key => 'id',
+ unique => [],
views => {
all => [
'txtdata',
@@ -7791,6 +7799,7 @@ $meta = {
'strand2'
],
primary_key => 'id',
+ unique => [],
views => {
all => [
'strand1',
@@ -8481,6 +8490,7 @@ $meta = {
'zone',
],
primary_key => 'id',
+ unique => [ [ ] ],
views => {
all => [
'tstamp',
-----------------------------------------------------------------------
Summary of changes:
etc/netdot.meta | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 2
Date: Fri, 30 Nov 2012 11:52:13 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-27-g5926ecf
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netdot".
The branch, netdot-1.0 has been updated
via 5926ecfc71889c3069b0c007f60041577a692d81 (commit)
from 123c5676f153bdc568a427256a770f403f16a739 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5926ecfc71889c3069b0c007f60041577a692d81
Author: Carlos Vicente <[email protected]>
Date: Fri Nov 30 14:52:06 2012 -0500
Added some minor comments
diff --git a/htdocs/management/ip.html b/htdocs/management/ip.html
index fc56e91..b28f7a7 100644
--- a/htdocs/management/ip.html
+++ b/htdocs/management/ip.html
@@ -1540,6 +1540,7 @@ print $tmp{value};
</div>
<div class="containerbody">
% if ( $_action eq 'VIEW_ADD_FZONES' ){
+% my $czone = ($o->forward_zone)? $o->forward_zone->name : "none";
% my @all_zones = sort { $a->name cmp $b->name } Zone->retrieve_all;
% my %cur_zones;
% map { $cur_zones{$_->zone->id} = 1 } @sz;
@@ -1547,7 +1548,10 @@ print $tmp{value};
<input type="hidden" name="id" value="<% $o->id %>">
<input type="hidden" name="_action" value="LINK_ZONES">
<input type="hidden" name="view" value="Zones">
- Link this block with existing forward zones:
+ <p>Zones are inherited from superior blocks. The current forward
zone for this block is:
+ <p>
+% print " $czone";
+ <p>Link this block with existing forward zones:
<p><select name="link_zones" multiple="multiple">
<option value=""> - select - </option>
% foreach my $zone ( grep { $_->active == 1 && $_->name !~ /\.arpa$/
} @all_zones ){
diff --git a/lib/Netdot/Model/Ipblock.pm b/lib/Netdot/Model/Ipblock.pm
index 9a10c45..7fd0178 100644
--- a/lib/Netdot/Model/Ipblock.pm
+++ b/lib/Netdot/Model/Ipblock.pm
@@ -2606,9 +2606,10 @@ sub dns_zones {
Arguments:
None
Returns:
- Zone object
+ Zone object or array of zone objects, depending on context
Examples:
my $zone = $ipb->forward_zone();
+ my @zones = $ibp->forward_zone();
=cut
sub forward_zone {
-----------------------------------------------------------------------
Summary of changes:
htdocs/management/ip.html | 6 +++++-
lib/Netdot/Model/Ipblock.pm | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 68, Issue 12
********************************************
