Merge "First implementation for Client and Server in same process. Additionally...
authorErich Keane <erich.keane@intel.com>
Thu, 14 Aug 2014 20:41:04 +0000 (13:41 -0700)
committerGerrit Code Review <gerrit@fmygit6001.fm.intel.com>
Thu, 14 Aug 2014 20:41:04 +0000 (13:41 -0700)
commit0a0a766ce5bf0b588b9cf6a13732e16571c3f291
treed3f9191f980ebbe4621da39dcecbb301986aeec2
parent0995a82ec113fa6a57e7cfbdf780b18a67d8dd63
parentd39f3fce61b19bddf75575275dac03a6de550070
Merge "First implementation for Client and Server in same process.  Additionally changed OCResource's IClientWrapper reference to a weak_ptr so that it doesn't cause a deadlock on destruction."