Merge branch 'master' into ra.to.merge 36/2436/1
authorMandeep Shetty <mandeep.shetty@intel.com>
Thu, 10 Sep 2015 00:58:44 +0000 (17:58 -0700)
committerMandeep Shetty <mandeep.shetty@intel.com>
Thu, 10 Sep 2015 00:58:44 +0000 (17:58 -0700)
Conflicts:
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp

Change-Id: I70ecb709845861789f326053b2135ca964bd21a5
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
1  2 
Readme.scons.txt
build_common/SConscript
resource/csdk/SConscript
resource/csdk/stack/samples/linux/SimpleClientServer/ocremoteaccessclient.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp

Simple merge
Simple merge
Simple merge
@@@ -978,8 -952,16 +981,17 @@@ int main(int argc, char* argv[]
          PrintUsage();
          return -1;
      }
 +
  #ifdef RA_ADAPTER
+     OCRAInfo_t rainfo;
+     rainfo.hostname = "localhost";
+     rainfo.port = 5222;
+     rainfo.xmpp_domain = "localhost";
+     rainfo.username = "test1";
+     rainfo.password = "intel123";
+     rainfo.resource = "";
+     rainfo.user_jid = "";
      OCSetRAInfo(&rainfo);
  #endif