Signed-off-by: redtroy <redtroy@sxj.com>
Merge branch 'master' of scm@192.168.1.10:/home/scm/repositories/sxj-src.git
Merge branch 'master' of
scm@192.168.1.10:/home/scm/repositories/sxj-src.git
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
2014/11/20
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
2014/11/21
Change-Id: Ibd5484aa86c733bfae396b5594182bc87829dd22
message
Change-Id: I0ba7a8336b60cb57c90f052f467cf10d14a5f533
Change-Id: I6b17e0fc26a3c330e726e92bac756bbb6a256d78
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	supervisor-parent/supervisor-manager/src/main/resources/log4j.properties
	supervisor-parent/supervisor-website/src/main/resources/log4j.properties
Change-Id: I53fac225076916b0370d1c4847965b948d839a71