add "cluster resize-ring <new-size>" to riak-admin
Merge branch 'master' into jrw-dynamic-ring
Update resize-ring with common node_up call
Add health check deprecation note to config
Merge pull request #311 from basho/jrw-dynamic-ring

add "cluster resize-ring <new-size>" to riak-admin
Merge pull request #333 from basho/eas-add-health-check-deprecation-note

Add health check deprecation note to config
Add health check deprecation note to config
Update release notes, roll version 1.3.2rc3
Remove -kernel net_ticktime setting
Roll riak version 1.4.0pre1
update default configs for 1.3.2
Merge pull request #336 from basho/pevm-vm-args-update

update default configs for 1.3.2
Roll riak version 1.3.2rc4
Merge branch '1.3'

Conflicts:
	RELEASE-NOTES.md
	rel/files/vm.args
	rel/reltool.config
Add known issue with leveldb read block error stat to release notes
Roll riak 1.4.0pre2
Move binaries to sbin to align with 1.3
update vm.args for moving to OTP team scheduler patch
Merge pull request #339 from basho/pevm-vm-args-update2

update vm.args for moving to OTP team scheduler patch
update vm.args for moving to OTP team scheduler patch