slice
slice
slice
slice
vm.js:commit disable
Merge branch 'cetc-release-1.0' of 192.168.5.102:ccf into cetc-release-1.0
Merge branch 'cetc-release-1.0' of 192.168.5.102:~/ccf into cetc-release-1.0
multi sflow server
sflow migration
sflow port zh_CN
Merge branch 'cetc-release-1.0' of 192.168.5.102:ccf into cetc-release-1.0
fix bugs
fix bugs

Conflicts:

	resources/models.py
slice check_vm_state
slice start_or_stop_slice when redis-server down
slice gw server select
slice controller edit or gw add when slice state changed
slice
slice edit controller and update slice on cnvp
config