[openrtm-commit:01048] r549 - in trunk/OpenRTM-aist-Python: . OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2013-04-17 15:46:26 +0900 (Wed, 17 Apr 2013)
New Revision: 549

Modified:
   trunk/OpenRTM-aist-Python/
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py
   trunk/OpenRTM-aist-Python/setup.py
Log:
merged r488-494,496-497 from branches/RELENG_1_1


Property changes on: trunk/OpenRTM-aist-Python
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/RELENG_1_1/OpenRTM-aist-Python:1-485
   + /branches/RELENG_1_1/OpenRTM-aist-Python:1-548
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,495
/branches/work/OpenRTM-aist-Python:505-509
   + /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,488-497
/branches/work/OpenRTM-aist-Python:505-509

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py	2013-04-17 06:41:34 UTC (rev 548)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py	2013-04-17 06:46:26 UTC (rev 549)
@@ -130,7 +130,7 @@
   # @endif
   def __init__(self, name, var, def_val, trans=None):
     self.name = name
-    self.default_value = def_val
+    self._default_value = def_val
     self.string_value = ""
     self.callback = None
     self._var = var


Property changes on: trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:396-478,495
/branches/work/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:505-509
   + /branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:396-478,488-497
/branches/work/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:505-509


Property changes on: trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:396-478,495
/branches/work/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:505-509
   + /branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:396-478,488-497
/branches/work/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:505-509


Property changes on: trunk/OpenRTM-aist-Python/setup.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-478,495
/branches/work/OpenRTM-aist-Python/setup.py:505-509
   + /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-478,488-497
/branches/work/OpenRTM-aist-Python/setup.py:505-509