Merge remote branch 'origin/4.3' into 4.3

diff --git a/db-config.d/03-interfacesettings b/db-config.d/03-interfacesettings
index e95e224..bac8c72 100644 (file)
--- a/db-config.d/03-interfacesettings
+++ b/db-config.d/03-interfacesettings
@@ -9,6 +9,11 @@ setting_types = \
      'description': "Set interface name, instead of eth0 or the like",
      'min_role_id' : 40},
 
+    {'category' : "interface/route",
+     'tagname' : "staticroute",
+     'description': "Set static route for interfaces",
+     'min_role_id' : 40},
+
     {'category' : "interface/multihome",
      'tagname' : "alias",
      'description': "Specifies that the network is used for multihoming",

diff --git a/myplc-docs.spec b/myplc-docs.spec
index d9444f7..e009ab0 100644 (file)
--- a/myplc-docs.spec
+++ b/myplc-docs.spec
@@ -5,7 +5,7 @@
 
 %define name myplc-docs
 %define version 4.3
-%define taglevel 47
+%define taglevel 48
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/html/planetlab/doc/
 
 %changelog
+* Wed Apr 06 2011 S.Çağlar Onur <caglar@verivue.com> - myplc-4.3-48
+- Introduce staticroute tagtype
+
 * Mon Mar 21 2011 S.Çağlar Onur <caglar@verivue.com> - myplc-4.3-47
 - attempt to fix small glitches
 

diff --git a/myplc-release.spec b/myplc-release.spec
index b912b92..0271c82 100644 (file)
--- a/myplc-release.spec
+++ b/myplc-release.spec
@@ -5,7 +5,7 @@
 
 %define name myplc-release
 %define version 4.3
-%define taglevel 47
+%define taglevel 48
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/myplc-release
 
 %changelog
+* Wed Apr 06 2011 S.Çağlar Onur <caglar@verivue.com> - myplc-4.3-48
+- Introduce staticroute tagtype
+
 * Mon Mar 21 2011 S.Çağlar Onur <caglar@verivue.com> - myplc-4.3-47
 - attempt to fix small glitches
 

diff --git a/myplc.spec b/myplc.spec
index e98132f..60a3ce2 100644 (file)
--- a/myplc.spec
+++ b/myplc.spec
@@ -5,7 +5,7 @@
 
 %define name myplc
 %define version 4.3
-%define taglevel 47
+%define taglevel 48
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch        %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -222,6 +222,9 @@ fi
 
 
 %changelog
+* Wed Apr 06 2011 S.Çağlar Onur <caglar@verivue.com> - myplc-4.3-48
+- Introduce staticroute tagtype
+
 * Mon Mar 21 2011 S.Çağlar Onur <caglar@verivue.com> - myplc-4.3-47
 - attempt to fix small glitches