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.7-30-g47d6c31 ([email protected])
2. [SCM] Netdot branch master updated. netdot-1.0.7-30-g47d6c31
([email protected])
3. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.7-35-gc4e7590 ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 14 Mar 2016 05:58:34 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.7-30-g47d6c31
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 47d6c31eaa4d4f67d845ecb189de0f1eab3111fb (commit)
from 160b2c30095d47cc29cfcf8113d66b2681385a30 (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 47d6c31eaa4d4f67d845ecb189de0f1eab3111fb
Author: Carlos Vicente <[email protected]>
Date: Wed Feb 24 18:18:24 2016 -0500
Add option to include master data in MySQL dump
diff --git a/bin/dump-db.pl b/bin/dump-db.pl
index e34ce8b..e60261d 100755
--- a/bin/dump-db.pl
+++ b/bin/dump-db.pl
@@ -24,15 +24,17 @@ usage: $0 [options]
--dbuser <username> Database DBA user (default: $self{dbuser})
--dbpass <password> Database DBA password
--dir <path> Directory where files should be written (default:
$self{dir})
+ --master-data Include master data in dump (MySQL)
--help Display this message
EOF
-my $result = GetOptions( "dbtype=s" => \$self{dbtype},
- "dbuser=s" => \$self{dbuser},
- "dbpass=s" => \$self{dbpass},
- "dir:s" => \$self{dir},
- "help=s" => \$self{help},
- "debug" => \$self{debug},
+my $result = GetOptions( "dbtype=s" => \$self{dbtype},
+ "dbuser=s" => \$self{dbuser},
+ "dbpass=s" => \$self{dbpass},
+ "dir:s" => \$self{dir},
+ "master-data" => \$self{master_data},
+ "help=s" => \$self{help},
+ "debug" => \$self{debug},
);
if( ! $result || $self{help} ) {
@@ -54,7 +56,10 @@ my $file = $self{dir}."/$hostname-$date.sql";
## Dump the database
if ($self{dbtype} eq 'mysql'){
- system ("mysqldump --opt -u$self{dbuser} -p$self{dbpass} netdot >$file");
+ my @args = ('--opt', "-u$self{dbuser}", "-p$self{dbpass}");
+ push @args, '--master-data' if $self{master_data};
+ my $dump_args = join ' ', @args;
+ system ("mysqldump $dump_args netdot >$file");
}elsif ($self{dbtype} eq 'pg'){
die "$self{dbtype} not yet implemented";
}else{
-----------------------------------------------------------------------
Summary of changes:
bin/dump-db.pl | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 2
Date: Mon, 14 Mar 2016 05:59:06 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch master updated.
netdot-1.0.7-30-g47d6c31
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, master has been updated
via 47d6c31eaa4d4f67d845ecb189de0f1eab3111fb (commit)
from 160b2c30095d47cc29cfcf8113d66b2681385a30 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
bin/dump-db.pl | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 3
Date: Mon, 14 Mar 2016 06:01:20 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.7-35-gc4e7590
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 c4e7590064309d6f518c85dc534d9fe18e20bb0f (commit)
via a931116d1272214cf165589b0b9b82568daa4fca (commit)
via 2c4dd4eb919b7fac901918152aa0384ce9517b53 (commit)
via 9d164d9e14abf94ffb91954e76403e6dccfd3033 (commit)
via 7fe17bf5c35aa6f107b770d434bf7a62338973bb (commit)
from 47d6c31eaa4d4f67d845ecb189de0f1eab3111fb (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 c4e7590064309d6f518c85dc534d9fe18e20bb0f
Merge: 47d6c31 a931116
Author: Carlos Vicente <[email protected]>
Date: Wed Feb 24 18:19:48 2016 -0500
Merge branch 'master' of github.com:cvicente/Netdot
commit a931116d1272214cf165589b0b9b82568daa4fca
Merge: 2c4dd4e 9d164d9
Author: Carlos Vicente <[email protected]>
Date: Sat Feb 20 16:09:47 2016 -0500
Merge pull request #36 from operatorofhell/master
View template for Table DhcpScope added
commit 2c4dd4eb919b7fac901918152aa0384ce9517b53
Merge: 160b2c3 7fe17bf
Author: Carlos Vicente <[email protected]>
Date: Sat Feb 20 16:04:52 2016 -0500
Merge pull request #35 from rfdrake/issue_34
fixes issue #34
commit 9d164d9e14abf94ffb91954e76403e6dccfd3033
Author: Moritz Kraus <[email protected]>
Date: Sat Jul 4 01:48:29 2015 +0200
View template for Table DhcpScope added
diff --git a/etc/netdot.meta b/etc/netdot.meta
index cc33903..c18fb24 100644
--- a/etc/netdot.meta
+++ b/etc/netdot.meta
@@ -3340,6 +3340,11 @@ $meta = {
'physaddr',
'text'
],
+ template => [
+ 'name',
+ 'type',
+ 'active'
+ ],
pool => [
'name',
'type',
commit 7fe17bf5c35aa6f107b770d434bf7a62338973bb
Author: Robert Drake <[email protected]>
Date: Thu May 7 23:28:50 2015 -0400
fixes issue #34
Netdot/Model/Plugins/DeviceIpNamesFixed.pm did not return a
true value at (eval 182) line 2.
diff --git a/lib/Netdot/Model/Plugins/DeviceIpNamesFixed.pm
b/lib/Netdot/Model/Plugins/DeviceIpNamesFixed.pm
index a19ac19..748f851 100644
--- a/lib/Netdot/Model/Plugins/DeviceIpNamesFixed.pm
+++ b/lib/Netdot/Model/Plugins/DeviceIpNamesFixed.pm
@@ -60,6 +60,8 @@ sub get_name {
return $ip->interface->device->short_name;
}
+1;
+
=head1 AUTHORS
Carlos Vicente, C<< <cvicente at ns.uoregon.edu> >>
-----------------------------------------------------------------------
Summary of changes:
etc/netdot.meta | 5 +++++
lib/Netdot/Model/Plugins/DeviceIpNamesFixed.pm | 2 ++
2 files changed, 7 insertions(+)
hooks/post-receive
--
Netdot
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 108, Issue 4
********************************************
