Merge branch 'master' into resource-container
authorMarkus Jung <markus.jung85@gmail.com>
Wed, 18 Nov 2015 20:02:00 +0000 (05:02 +0900)
committerMarkus Jung <markus.jung85@gmail.com>
Wed, 18 Nov 2015 20:03:41 +0000 (05:03 +0900)
commitea38102e4a3499917945d5244d4e89ec2c8bf94b
treec1d665e92c9bc4278405a003e482a10f1be2fb11
parent5c43b60e6657c8a995e2acdd35a1eb6daa82c13e
parent40a94b84c8b77a5b5911d9dbc2081c48c452fd9a
Merge branch 'master' into resource-container

Change-Id: I897c55a73b18288a0686a6d6770cf8fd8dcf1f2c
Signed-off-by: Markus Jung <markus.jung85@gmail.com>
service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp