Merge branch '1.3-rel' 51/19451/2
authorKevin Kane <kkane@microsoft.com>
Mon, 1 May 2017 16:30:48 +0000 (09:30 -0700)
committerKevin Kane <kkane@microsoft.com>
Mon, 1 May 2017 16:30:48 +0000 (09:30 -0700)
Change-Id: I6912a792ca82ad8f0f5156c520119523b30bc19f
Signed-off-by: Kevin Kane <kkane@microsoft.com>
1  2 
resource/IPCA/src/inc/callback.h
resource/IPCA/unittests/SConscript
resource/csdk/stack/octbstack_product_secured.def
resource/csdk/stack/src/ocstack.c

Simple merge
@@@ -28,8 -28,6 +28,7 @@@ Import('test_env'
  ipcatest_env = test_env.Clone()
  src_dir = ipcatest_env.get('SRC_DIR')
  target_os = ipcatest_env.get('TARGET_OS')
- rd_mode = ipcatest_env.get('RD_MODE')
 +with_cloud = ipcatest_env.get('WITH_CLOUD')
  
  if ipcatest_env['CC'] == 'cl':
      ipcatest_env.AppendUnique(CCFLAGS=['/W4'])
Simple merge