Merge branch '1.3-rel' (18653a80) 61/21961/2
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Wed, 16 Aug 2017 12:10:20 +0000 (14:10 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Wed, 16 Aug 2017 16:05:15 +0000 (18:05 +0200)
Relate-to:
https://gerrit.iotivity.org/gerrit/21799
https://gerrit.iotivity.org/gerrit/21897
https://gerrit.iotivity.org/gerrit/21679
https://gerrit.iotivity.org/gerrit/21869
https://gerrit.iotivity.org/gerrit/21775
https://gerrit.iotivity.org/gerrit/21773
https://gerrit.iotivity.org/gerrit/21905
https://gerrit.iotivity.org/gerrit/21209
https://gerrit.iotivity.org/gerrit/21507
https://gerrit.iotivity.org/gerrit/21867
https://gerrit.iotivity.org/gerrit/21797
https://gerrit.iotivity.org/gerrit/21529
https://gerrit.iotivity.org/gerrit/21845
https://gerrit.iotivity.org/gerrit/21791
https://gerrit.iotivity.org/gerrit/21777
https://gerrit.iotivity.org/gerrit/21839
https://gerrit.iotivity.org/gerrit/20443
https://gerrit.iotivity.org/gerrit/21829
https://gerrit.iotivity.org/gerrit/21477
https://gerrit.iotivity.org/gerrit/21865
https://gerrit.iotivity.org/gerrit/21875
https://gerrit.iotivity.org/gerrit/21671
https://gerrit.iotivity.org/gerrit/21423
https://gerrit.iotivity.org/gerrit/21585
https://gerrit.iotivity.org/gerrit/21801
https://gerrit.iotivity.org/gerrit/21699

Conflicts:
extlibs/wksxmppxep/SConscript
resource/csdk/connectivity/src/cainterfacecontroller.c
resource/csdk/security/src/credresource.c
resource/csdk/security/tool/svrdbeditor_src/svrdbeditorcred.c
service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp

Change-Id: I18653a80defeb32c37d4ab94a4ce8c07b7766813
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
15 files changed:
1  2 
build_common/SConscript
extlibs/libcoap/SConscript
extlibs/wksxmppxep/SConscript
java/jni/SConscript
resource/csdk/connectivity/src/cainterfacecontroller.c
resource/csdk/resource-directory/src/rd_server.c
resource/csdk/security/provisioning/src/pmutility.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/crlresource.c
resource/csdk/security/src/doxmresource.c
resource/csdk/stack/SConscript
resource/csdk/stack/src/ocpayloadconvert.c
resource/examples/SConscript
resource/unit_tests.scons
service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp

Simple merge
Simple merge
@@@ -23,7 -23,8 +23,7 @@@ LIB_PATH = SRC_PAT
  WJSXMPPXEP_LIBS = ['wksxmppxep', 'm', 'crypto']
  
  if with_ra_ibb:
-     env.SConscript('#extlibs/libstrophe/SConscript')
 -
+     env.SConscript('#/extlibs/libstrophe/SConscript')
      if not os.path.exists(INC_PATH):
          raxmpp_env = Environment(ENV=os.environ)
          c = raxmpp_env.Action([
Simple merge
Simple merge
Simple merge
Simple merge