From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 27 Mar 2012 11:13:17 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myplc
X-Git-Tag: myplc-5.1-1~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0c52bbbae08d0d04b99fb060dc4a493c9280e713;hp=e3800c698dbd857ed8cd84baeff18f341d9beeaf;p=myplc.git

Merge branch 'master' of ssh://git.onelab.eu/git/myplc
---

diff --git a/db-config.d/040-init_scripts b/db-config.d/040-init_scripts
index e86ec0f..bfdcff6 100644
--- a/db-config.d/040-init_scripts
+++ b/db-config.d/040-init_scripts
@@ -1,6 +1,4 @@
 # -*-python-*-
-# $Id$
-# $URL$
 #################### initscripts
 # Default Initscripts
 default_initscripts = []
diff --git a/db-config.d/080-slice_netflow b/db-config.d/080-slice_netflow
index 7af59e0..24899fe 100644
--- a/db-config.d/080-slice_netflow
+++ b/db-config.d/080-slice_netflow
@@ -1,6 +1,4 @@
 # -*-python-*-
-# $Id$
-# $URL$
 ####################
 # Create/update system slices
 
diff --git a/db-config.d/081-slice_sirius b/db-config.d/081-slice_sirius
index dca2399..897bcfd 100644
--- a/db-config.d/081-slice_sirius
+++ b/db-config.d/081-slice_sirius
@@ -1,6 +1,4 @@
 # -*-python-*-
-# $Id$
-# $URL$
 ####################
 # Create/update system slices
 
diff --git a/db-config.d/082-slice_sfacm b/db-config.d/082-slice_sfacm
index eaf06fc..af0a9de 100644
--- a/db-config.d/082-slice_sfacm
+++ b/db-config.d/082-slice_sfacm
@@ -1,6 +1,4 @@
 # -*-python-*-
-# $Id$
-# $URL$
 ####################
 # Create/update system slices