Merge branch 'connectivity-abstraction' to master
authorErich Keane <erich.keane@intel.com>
Fri, 10 Apr 2015 00:50:26 +0000 (17:50 -0700)
committerErich Keane <erich.keane@intel.com>
Fri, 10 Apr 2015 19:06:24 +0000 (12:06 -0700)
commit9015fb1a75f3b43b57153b840f73a2ebc4bb8a63
tree014c7d90ff551ecb211cc5d47a12b657fddfb6dd
parentaf9f5813db40c69283b1d25e3aeade2924e2022e
parent8c3d005c76871cdcb238343e2563bdbfd6a7ee59
Merge branch 'connectivity-abstraction' to master

Change-Id: I54ea8ab0ea7c4929576ac9b613ce19c79a5c92b8
Signed-off-by: Erich Keane <erich.keane@intel.com>
54 files changed:
.gitignore
Readme.scons.txt
auto_build.sh
build_common/android/SConscript
build_common/arduino/SConscript
build_common/darwin/SConscript
build_common/linux/SConscript
examples/OICMiddle/Client.cpp
extlibs/boost/SConscript
extlibs/buildDependencies.sh
resource/SConscript
resource/buildScript.mk
resource/csdk/SConscript
resource/csdk/connectivity/common/src/logger.c
resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript
resource/csdk/connectivity/samples/linux/README
resource/csdk/makefile
resource/csdk/stack/include/internal/oicgroup.h
resource/csdk/stack/include/ocstack.h
resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
resource/csdk/stack/src/occollection.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/oicgroup.c
resource/examples/garageclient.cpp
resource/examples/groupclient.cpp
resource/examples/presenceclient.cpp
resource/examples/simpleserver.cpp
resource/examples/threadingsample.cpp
resource/include/OCPlatform_impl.h
resource/include/OCRepresentation.h
resource/include/OCResource.h
resource/include/OCUtilities.h
resource/include/OutOfProcClientWrapper.h
resource/makefile
service/notification-manager/SConscript
service/notification-manager/SampleApp/linux/sampleProvider/SampleProvider.cpp
service/protocol-plugin/plugin-manager/SConscript
service/protocol-plugin/plugins/SConscript
service/protocol-plugin/plugins/mqtt-fan/lib/mosquitto.c
service/protocol-plugin/sample-app/linux/SConscript
service/protocol-plugin/sample-app/linux/mqtt/Makefile
service/soft-sensor-manager/SConscript
service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMResourceServer.cpp
service/soft-sensor-manager/SSMCore/src/SensorProcessor/ResourceFinder.cpp
service/soft-sensor-manager/SampleApp/SConscript
service/soft-sensor-manager/SampleApp/linux/HeightSensorApp/SConscript
service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/src/SSMTestApp.cpp
service/soft-sensor-manager/SampleApp/linux/THSensorApp/SConscript
service/soft-sensor-manager/SampleApp/linux/THSensorApp1/SConscript
service/soft-sensor-manager/SampleApp/linux/WeightSensorApp/SConscript
service/things-manager/SConscript
service/things-manager/sampleapp/linux/configuration/SConscript
service/things-manager/sdk/src/GroupManager.cpp