deploy swift storage server
deploy swift storage server
deploy swift storage server
deploy swift storage server
deploy swift storage server
by garfield
fix swift ring file setup
add swift-nginx-setup
set net-ssh version 2.7.0 --Gemfile
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/config_file/server.json
	config/loadinfo/vm_access.rb
add nginx proxy_pass to swift-nginx & swift proxy token_life
add nginx proxy_pass to swift-nginx & swift proxy token_life
fix sinatra setup
Auto-merging config/deploy.rb
Auto-merging config/deploy.rb
Merge pull request #23 from GarfieldLinux/master

Newhire Staging All In One   Done