aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve McIntyre <steve.mcintyre@linaro.org>2016-03-12 11:50:10 +0000
committerSteve McIntyre <steve.mcintyre@linaro.org>2016-03-12 11:50:10 +0000
commitd2313b2cdb7e4c4b81330ff6e4efc51ac8b032af (patch)
tree318716e0a4d4e90fe6e22bf54423c48d31c4818f
parent0487436edbdb1c13b1d90f15e4f5903ca65e586b (diff)
Start 0.6 development, and update boilerplate
Change-Id: Ie4c201b50803ef0e32cef19459088a215b95ed2d
-rwxr-xr-xadmin.py5
-rw-r--r--util.py20
-rwxr-xr-xvland.py4
3 files changed, 25 insertions, 4 deletions
diff --git a/admin.py b/admin.py
index a6bf735..3699ccc 100755
--- a/admin.py
+++ b/admin.py
@@ -1,6 +1,6 @@
#! /usr/bin/python
-# Copyright 2014-2015 Linaro Limited
+# Copyright 2014-2016 Linaro Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -31,7 +31,8 @@ from errors import InputError, SocketError
from config.config import VlanConfig
from ipc.ipc import VlanIpc
-version = "0.5"
+prog = "admin"
+version = "0.6-DEV"
banner = "Linaro VLANd admin interface, version %s" % version
TRUNK_ID_NONE = -1
diff --git a/util.py b/util.py
index 4c9816a..493a4dc 100644
--- a/util.py
+++ b/util.py
@@ -1,3 +1,23 @@
+# Copyright 2014-2016 Linaro Limited
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+# Utility routines, including handling of API functions
+#
+
import logging
import time
from errors import CriticalError, InputError, ConfigError, SocketError
diff --git a/vland.py b/vland.py
index b237a9c..b3e1418 100755
--- a/vland.py
+++ b/vland.py
@@ -1,6 +1,6 @@
#! /usr/bin/python
-# Copyright 2014-2015 Linaro Limited
+# Copyright 2014-2016 Linaro Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ class DaemonState:
""" Simple container for stuff to make for nicer syntax """
state = DaemonState()
-state.version = "0.5"
+state.version = "0.6-DEV"
state.banner = "Linaro VLANd version %s" % state.version
state.starttime = time.time()
state.vis = None