NOTICKET: Fix issues caused by merge
authorKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Thu, 20 Apr 2017 14:59:43 +0000 (10:59 -0400)
committerKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Thu, 20 Apr 2017 14:59:43 +0000 (10:59 -0400)
commit83ebeec87b6e614f2b870e37326015a9ed468346
tree2b6a8cf76f54eb18c54d9ebf54b086464ff962eb
parent80097691f3ed0adb4406906ef619c1042c2219ea
NOTICKET: Fix issues caused by merge

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
skyquake/framework/core/api_utils/sockets.js
skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx