From: Baris Metin <bmetin@verivue.com>
Date: Fri, 8 Apr 2011 22:28:34 +0000 (-0400)
Subject: Merge branch '4.3' of git.verivue.com:/git/planetlab/myplc into origin-4.3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e104bd1e01ab3a283fe91c5ddaf7a86bdc8366a9;hp=-c;p=myplc.git

Merge branch '4.3' of git.verivue.com:/git/planetlab/myplc into origin-4.3
---

e104bd1e01ab3a283fe91c5ddaf7a86bdc8366a9
diff --combined myplc.spec
index 190cbe9,15fbba4..5f010ba
--- a/myplc.spec
+++ b/myplc.spec
@@@ -5,7 -5,7 +5,7 @@@
  
  %define name myplc
  %define version 4.3
- %define taglevel 47
+ %define taglevel 49
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  %global python_sitearch	%( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@@ -64,6 -64,7 +64,6 @@@ Requires: vixie-cro
  Requires: bootmanager
  Requires: bootcd-%{pldistro}-%{_arch}
  Requires: PLCWWW
 -Requires: www-register-wizard
  Requires: nodeconfig
  Requires: PLCAPI
  Requires: pcucontrol
@@@ -220,6 -221,12 +220,12 @@@ f
  
  
  %changelog
+ * Thu Apr 07 2011 S.Çağlar Onur <caglar@verivue.com> - myplc-4.3-49
+ - Remove Monitor references from spec file
+ 
+ * 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