Merge all changes of easy setup in master branch to 1.2-rel branch
authorParkhi <h_w.park@samsung.com>
Fri, 30 Sep 2016 02:41:03 +0000 (11:41 +0900)
committerUze Choi <uzchoi@samsung.com>
Fri, 30 Sep 2016 04:03:52 +0000 (04:03 +0000)
commit6b5e9ff337264c38951bef39fd4980ab697f14ac
tree45340eec78d390799905dc965b311ceb9f9a11ea
parentf175c1a191e3dcb149a53eba31235f840abed61d
Merge all changes of easy setup in master branch to 1.2-rel branch

  https://gerrit.iotivity.org/gerrit/#/c/11947/
  https://gerrit.iotivity.org/gerrit/#/c/12003/
  https://gerrit.iotivity.org/gerrit/#/c/12155/
  https://gerrit.iotivity.org/gerrit/#/c/11991/

Change-Id: Id3ac0160c5edd6c7abecb9714425601747d1a384
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12607
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
service/easy-setup/enrollee/unittests/ESEnrolleeTest.cpp
service/easy-setup/inc/escommon.h
service/easy-setup/mediator/richsdk/SConscript [changed mode: 0644->0755]
service/easy-setup/mediator/richsdk/src/CloudResource.cpp
service/easy-setup/mediator/richsdk/src/EnrolleeResource.cpp
service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp
service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h
service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
service/easy-setup/mediator/richsdk/unittests/ESMediatorTest.cpp
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator_cpp.cpp