[openrtm-commit:02688] r965 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-07-13 15:54:28 +0900 (Thu, 13 Jul 2017)
New Revision: 965

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
Log:
[compat,->RELENG_1_2] refs #4128

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2017-07-13 01:57:06 UTC (rev 964)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2017-07-13 06:54:28 UTC (rev 965)
@@ -1880,6 +1880,7 @@
             "naming.enable",
             "naming.type",
             "naming.formats",
+            "manager.instance_name",
             ""
         };