client
client
Merge remote-tracking branch 'origin/master'

Conflicts:
	MapReduceFramework/src/lxu/lxdfs/client/ClientOutputStream.java
	MapReduceFramework/src/lxu/lxdfs/client/ClientPacket.java
	MapReduceFramework/src/lxu/lxdfs/metadata/BlocksLocation.java
	MapReduceFramework/src/lxu/lxdfs/namenode/NameNode.java
	MapReduceFramework/src/lxu/lxdfs/service/INameSystemService.java
	MapReduceFramework/src/lxu/lxdfs/service/NameSystemService.java
client