Change-Id: Ibf618a036c78bcde34c344c741d75644aaf11760
Change-Id: I56b2ca2c661e3ee460f28cf1c332590d8deea715
Change-Id: I1eec87be52bd08286de79e976bb68b9f6fbe9c5d
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	supervisor-parent/supervisor-website/src/main/resources/spring/database-config.xml
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
me
me
Signed-off-by: qjj[merge] <qjj@sxj.com>
Change-Id: I66e9d1ec1d0abecbf3d32963a09277f87c1cb1e1
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: I47333a0f364886f73694042613f282a38af3701d
Signed-off-by: qjj[merge] <qjj@sxj.com>
Merge branch 'master' of scm@192.168.1.10:/home/scm/repositories/sxj-src.git