[openrtm-commit:01923] r2718 - in tags/RELEASE_1_1_2/OpenRTM-aist: . examples/Composite

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-04-28 14:46:08 +0900 (Thu, 28 Apr 2016)
New Revision: 2718

Added:
   tags/RELEASE_1_1_2/OpenRTM-aist/examples/Composite/rtc.composite.linux.conf
Modified:
   tags/RELEASE_1_1_2/OpenRTM-aist/
Log:
[merge] r2717 has been merged from trunk.


Property changes on: tags/RELEASE_1_1_2/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715,2717

Copied: tags/RELEASE_1_1_2/OpenRTM-aist/examples/Composite/rtc.composite.linux.conf (from rev 2717, trunk/OpenRTM-aist/examples/Composite/rtc.composite.linux.conf)
===================================================================
--- tags/RELEASE_1_1_2/OpenRTM-aist/examples/Composite/rtc.composite.linux.conf	                        (rev 0)
+++ tags/RELEASE_1_1_2/OpenRTM-aist/examples/Composite/rtc.composite.linux.conf	2016-04-28 05:46:08 UTC (rev 2718)
@@ -0,0 +1,7 @@
+corba.nameservers: localhost
+naming.formats: %h.host_cxt/%n.rtc
+logger.enable: NO
+manager.modules.load_path: ./, ./rtc
+manager.modules.preload: Controller.so, Motor.so, Sensor.so
+manager.components.precreate: Controller, Motor, Sensor, PeriodicECSharedComposite
+composite.PeriodicECShared.PeriodicECSharedComposite0.config_file: composite.conf