From: Git User <support@planet-lab.org>
Date: Mon, 29 Sep 2014 10:31:37 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/generic'
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=63cecc34d73c8b07ec508f994ad5ce87b46d67a8;hp=4d741f73ede2b7d60b8d8e380a9c070b99b94296;p=playground.git

Merge remote-tracking branch 'origin/generic'
---

diff --git a/playground.spec b/playground.spec
index eef5291..3ee0874 100644
--- a/playground.spec
+++ b/playground.spec
@@ -11,11 +11,14 @@
 %define module_taglevel_varname mytaglevel
 
 %global fullversion planetlab.4.2
-%define mytaglevel 0
+%define mytaglevel 1
 %define module_current_branch 1.4
 
 # this is for testing module-tools
 %changelog
+* Thu Jun 28 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - playground-planetlab.4.2-1
+- a oneliner
+
 * Thu Jul 24 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - playground-1.4-1
 - testing taging and branching
 
diff --git a/test_avakian b/test_avakian
new file mode 100644
index 0000000..ce01362
--- /dev/null
+++ b/test_avakian
@@ -0,0 +1 @@
+hello
diff --git a/test_inria b/test_inria
new file mode 100644
index 0000000..9daeafb
--- /dev/null
+++ b/test_inria
@@ -0,0 +1 @@
+test