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. [Netdot] 'DownLoad' wiki page has been updated
([email protected])
2. [SCM] Netdot annotated tag netdot-1.0.6 deleted.
netdot-1.0.5-3-g0033c07 ([email protected])
3. [SCM] Netdot annotated tag netdot-1.0.6 created. netdot-1.0.6
([email protected])
4. version numbering is confusing to me... (William Bulley)
5. [SCM] Netdot annotated tag netdot-1.0.6 deleted.
netdot-1.0.5-4-g4bcf101 ([email protected])
6. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.5-5-g0deb01b ([email protected])
7. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.5-6-gf505eba ([email protected])
8. [SCM] Netdot annotated tag netdot-1.0.6 created. netdot-1.0.6
([email protected])
9. [Netdot] 'DownLoad' wiki page has been updated
([email protected])
10. [Netdot] 'DownLoad' wiki page has been updated
([email protected])
11. [Netdot] News: Netdot 1.0.6 available for download
([email protected])
12. Netdot 1.0.6 release (Carlos Vicente)
13. [Netdot - Bug #1798] (New) Review Device unique constraints
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 10 Apr 2014 13:17:02 -0700
From: [email protected]
Subject: [Netdot-devel] [Netdot] 'DownLoad' wiki page has been updated
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
The 'DownLoad' wiki page has been updated by Carlos Vicente.
DownLoad:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/DownLoad
View differences:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/DownLoad/diff/67
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 2
Date: Thu, 10 Apr 2014 13:17:57 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot annotated tag netdot-1.0.6
deleted. netdot-1.0.5-3-g0033c07
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 annotated tag, netdot-1.0.6 has been deleted
was 02ae5e269171f8c34e8834e11d38918a741c4750
- Log -----------------------------------------------------------------
tag netdot-1.0.6
New release
0033c07224af64f88273b271da705580cec4a134 Fix bug in sortresults.html when sort
field is an Ipblock and it's unset
-----------------------------------------------------------------------
hooks/post-receive
--
Netdot
------------------------------
Message: 3
Date: Thu, 10 Apr 2014 13:24:09 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot annotated tag netdot-1.0.6
created. netdot-1.0.6
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 annotated tag, netdot-1.0.6 has been created
at 6edf54ab220e327f453a1a41b1eb11cd6d722d1d (tag)
tagging 4bcf1015c6b326f08433fcd05bcd83a409ce2cef (commit)
replaces netdot-1.0.5
tagged by Carlos Vicente
on Thu Apr 10 16:23:46 2014 -0400
- Log -----------------------------------------------------------------
New release
Carlos Vicente (4):
Fix error when displaying list of Ipblock attributes
Fix delete bug in previous changes to rest/host
Fix bug in sortresults.html when sort field is an Ipblock and it's unset
Bump version
-----------------------------------------------------------------------
hooks/post-receive
--
Netdot
------------------------------
Message: 4
Date: Thu, 10 Apr 2014 16:24:09 -0400
From: William Bulley <[email protected]>
Subject: [Netdot-devel] version numbering is confusing to me...
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=us-ascii
You have v1.0.5rc1 and "soon" v1.0.6 -- does that mean there is
not going to be a v1.0.5 release and you are going to go straight
to v1.0.6 or what? I'm confused. Thanks in advance.
Regards,
web...
--
William Bulley Email: [email protected]
72 characters width template ----------------------------------------->|
------------------------------
Message: 5
Date: Fri, 11 Apr 2014 06:20:58 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot annotated tag netdot-1.0.6
deleted. netdot-1.0.5-4-g4bcf101
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 annotated tag, netdot-1.0.6 has been deleted
was 6edf54ab220e327f453a1a41b1eb11cd6d722d1d
- Log -----------------------------------------------------------------
tag netdot-1.0.6
New release
4bcf1015c6b326f08433fcd05bcd83a409ce2cef Bump version
-----------------------------------------------------------------------
hooks/post-receive
--
Netdot
------------------------------
Message: 6
Date: Fri, 11 Apr 2014 06:22:08 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.5-5-g0deb01b
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 0deb01b0e8cf5fc0c1cafcd9abd0ad366571b463 (commit)
via 4bcf1015c6b326f08433fcd05bcd83a409ce2cef (commit)
from 0033c07224af64f88273b271da705580cec4a134 (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 0deb01b0e8cf5fc0c1cafcd9abd0ad366571b463
Author: Carlos Vicente <[email protected]>
Date: Fri Apr 11 09:21:54 2014 -0400
Update schema version
diff --git a/etc/default_data b/etc/default_data
index b4e0a71..729e411 100755
--- a/etc/default_data
+++ b/etc/default_data
@@ -1,4 +1,3 @@
-INSERT INTO schemainfo (version) VALUES('1.0.5');
INSERT INTO circuittype (name) VALUES ('DS3');
INSERT INTO circuittype (name) VALUES ('xDSL');
diff --git a/lib/DBUTIL.pm b/lib/DBUTIL.pm
index 38dd184..0f10059 100644
--- a/lib/DBUTIL.pm
+++ b/lib/DBUTIL.pm
@@ -456,22 +456,25 @@ CREATE USER $CONFIG{DB_NETDOT_USER} WITH PASSWORD
'$CONFIG{DB_NETDOT_PASS}' NOCR
sub insert_default_data{
my @data;
+
+ # Insert current schema version
+ # Get version number from library
+ my $version = `grep 'our \$VERSION' ../lib/Netdot.pm`;
+ chomp($version);
+ $version =~ s/.*\=\s+"(.*)";/$1/;
+ push @data, "INSERT INTO schemainfo (version) VALUES('$version');";
+
my $file = $CONFIG{DEFAULT_DATA};
if ( -f $file) {
- print "Inserting default data\n";
open (DEFAULT, "<$file") or die "Can't open $file: $!";
foreach (<DEFAULT>) {
next unless ( /\w+/ );
- if ( /INSERT INTO (\w+)/ ){
- my $t = $1;
- $t = lc($t);
- s/INSERT INTO \w+/INSERT INTO $t/;
- }
push @data, $_;
}
}else{
die "Can't find $file";
}
+ print "Inserting default data\n";
&db_query(\@data);
}
diff --git a/upgrade/updatedb b/upgrade/updatedb
index 2103f9f..f135fa7 100644
--- a/upgrade/updatedb
+++ b/upgrade/updatedb
@@ -51,11 +51,14 @@ if ( $schema_version eq '1.0.1' ){
&upg_104_105();
+}elsif ( $schema_version eq '1.0.5' ){
+
+ &upg_105_106();
+
}else{
die "Unsupported version for this upgrade: $schema_version\n";
}
-
&processdata(\@statements);
&dbdisconnect();
@@ -313,3 +316,8 @@ sub upg_104_105 {
push @statements, "UPDATE schemainfo SET version='1.0.5' WHERE id=1;";
}
+
+#########################################################################
+sub upg_105_106 {
+ push @statements, "UPDATE schemainfo SET version='1.0.6' WHERE id=1;",
+}
commit 4bcf1015c6b326f08433fcd05bcd83a409ce2cef
Author: Carlos Vicente <[email protected]>
Date: Thu Apr 10 16:21:19 2014 -0400
Bump version
diff --git a/lib/Netdot.pm b/lib/Netdot.pm
index 907d4e0..c6806c9 100644
--- a/lib/Netdot.pm
+++ b/lib/Netdot.pm
@@ -40,11 +40,11 @@ Netdot - Network Documentation Tool
=head1 VERSION
-Version 1.0.5
+Version 1.0.6
=cut
-our $VERSION = "1.0.5";
+our $VERSION = "1.0.6";
=head1 SYNOPSIS
-----------------------------------------------------------------------
Summary of changes:
etc/default_data | 1 -
lib/DBUTIL.pm | 15 +++++++++------
lib/Netdot.pm | 4 ++--
upgrade/updatedb | 10 +++++++++-
4 files changed, 20 insertions(+), 10 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 7
Date: Fri, 11 Apr 2014 06:27:25 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.5-6-gf505eba
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 f505eba20f2e0f4e695faf2602e47f11831b198b (commit)
from 0deb01b0e8cf5fc0c1cafcd9abd0ad366571b463 (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 f505eba20f2e0f4e695faf2602e47f11831b198b
Author: Carlos Vicente <[email protected]>
Date: Fri Apr 11 09:27:13 2014 -0400
Correction
diff --git a/upgrade/updatedb b/upgrade/updatedb
index f135fa7..a374d86 100644
--- a/upgrade/updatedb
+++ b/upgrade/updatedb
@@ -35,21 +35,25 @@ if ( $schema_version eq '1.0.1' ){
&upg_102_103();
&upg_103_104();
&upg_104_105();
+ &upg_105_106();
}elsif ( $schema_version eq '1.0.2' ){
&upg_102_103();
&upg_103_104();
&upg_104_105();
+ &upg_105_106();
}elsif ( $schema_version eq '1.0.3' ){
&upg_103_104();
&upg_104_105();
+ &upg_105_106();
}elsif ( $schema_version eq '1.0.4' ){
&upg_104_105();
+ &upg_105_106();
}elsif ( $schema_version eq '1.0.5' ){
-----------------------------------------------------------------------
Summary of changes:
upgrade/updatedb | 4 ++++
1 file changed, 4 insertions(+)
hooks/post-receive
--
Netdot
------------------------------
Message: 8
Date: Fri, 11 Apr 2014 06:30:23 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot annotated tag netdot-1.0.6
created. netdot-1.0.6
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 annotated tag, netdot-1.0.6 has been created
at 738d7e1c2fd083a58fdfe951412eeedef4a6334c (tag)
tagging f505eba20f2e0f4e695faf2602e47f11831b198b (commit)
replaces netdot-1.0.5
tagged by Carlos Vicente
on Fri Apr 11 09:29:52 2014 -0400
- Log -----------------------------------------------------------------
New release
Carlos Vicente (6):
Fix error when displaying list of Ipblock attributes
Fix delete bug in previous changes to rest/host
Fix bug in sortresults.html when sort field is an Ipblock and it's unset
Bump version
Update schema version
Correction
-----------------------------------------------------------------------
hooks/post-receive
--
Netdot
------------------------------
Message: 9
Date: Fri, 11 Apr 2014 09:07:21 -0700
From: [email protected]
Subject: [Netdot-devel] [Netdot] 'DownLoad' wiki page has been updated
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
The 'DownLoad' wiki page has been updated by Carlos Vicente.
DownLoad:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/DownLoad
View differences:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/DownLoad/diff/68
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 10
Date: Fri, 11 Apr 2014 09:07:36 -0700
From: [email protected]
Subject: [Netdot-devel] [Netdot] 'DownLoad' wiki page has been updated
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
The 'DownLoad' wiki page has been updated by Carlos Vicente.
DownLoad:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/DownLoad
View differences:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/DownLoad/diff/69
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 11
Date: Fri, 11 Apr 2014 09:10:19 -0700
From: [email protected]
Subject: [Netdot-devel] [Netdot] News: Netdot 1.0.6 available for
download
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Netdot 1.0.6 available for download
https://osl.uoregon.edu/redmine/news/12
Carlos Vicente
This is a maintenance release with a few bug fixes. Please see the [[Download]]
section for details.
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 12
Date: Fri, 11 Apr 2014 12:21:17 -0400
From: Carlos Vicente <[email protected]>
Subject: [Netdot-devel] Netdot 1.0.6 release
To: Netdot-users <[email protected]>,
[email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=windows-1252
Dear Netdot community,
Netdot 1.0.6 has been released:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/Download
You may ask, ?what about 1.0.5??
As you know, 1.0.5RC1 was around for a while. Then, briefly after tagging the
final 1.0.5 for release, we found a few bugs that needed fixing, so we didn?t
get to announce it.
Make sure to read doc/UPGRADE for specific upgrade instructions.
For a complete list of changes since 1.0.4 and 1.0.5, please refer to:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/105_ChangeLog
https://osl.uoregon.edu/redmine/projects/netdot/wiki/106_ChangeLog
Many thanks to all of you who submitted bug reports, patches and
suggestions!
Please report any bugs via the Redmine interface (e-mail registration
required):
https://osl.uoregon.edu/redmine/projects/netdot/issues
Thank you,
The Netdot Team
------------------------------
Message: 13
Date: Fri, 11 Apr 2014 11:00:59 -0700
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1798] (New) Review Device
unique constraints
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1798 has been reported by Carlos Vicente.
----------------------------------------
Bug #1798: Review Device unique constraints
https://osl.uoregon.edu/redmine/issues/1798
Author: Carlos Vicente
Status: New
Priority: Normal
Assignee: Carlos Vicente
Category: DeviceManagement
Target version: 1.1.0
Resolution:
<pre>
unique => [ ['name', 'asset_id'], ['name'] ],
</pre>
The first one seems unnecessary.
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 85, Issue 7
*******************************************
