Update bootstrap symantecs
CFEngine 3.5 bootstrap removed the policy-server option
http://cfengine.com/blog/cfengine-is-very-easy-to-install-and-now-so-is-bootstrapping
Correct 'exits' to 'exists'
Merge branch 'master' of git://github.com/mitchellh/vagrant
Add ability to specify custom cfengine pacakge name
This is intended to allow adding support for installing CFEngine
Enterprise.
Merge pull request #1925 from ROBLOX/master

Allow setting IP when using DHCP private network
Update CHANGELOG
Vagrant reports properly error for not found command
DHCP renewal on Debian/Ubuntu after setting hostname

On Debian and Ubuntu guests, when the new hostname of the guest box is
set, the DHCP client (isc-dhcp-client) won't renew its DHCP lease with
the new hostname. Executing "ifdown -a; ifup -a" to reinitialize all auto
interfaces fixes this issue.

Furthermore, as vagrant will now actually wait until a DHCP lease is
acquired, it is guaranteed that the the correct domainname is set from
DHCP before calling other provisioners like puppet, that rely on it.
This fixes puppet/facter sometimes failing to find the fqdn fact on an
LXC guest when the DHCP server is responding too slow.
NFS exports with single quotes now work properly [GH-1166]
Merge pull request #1929 from fpletz/fix/master/fix_dhcp_on_debian_ubuntu_guests

DHCP renewal on Debian/Ubuntu after setting hostname
Update CHANGELOG
Merge pull request #1928 from korya/master

When top-of-branch vagrant tries to execute a command, which does not exist in PATH, error report does not display the executable name.
CHANGELOG
Merge pull request #1920 from nickanderson/feature/custom_cf_package_name

Feature/custom cf package name
CHANGELOG
Merge pull request #1905 from bdon/master

correct 'exits' to 'exists'
Add DSAAuthentication=yes flag to SSH [GH-1900]
Adds file_cache_path support for chef_solo. [GH-1897]

Conflicts:
	CHANGELOG.md
Moves to using new chef cache/backup dir defaults.

Conflicts:
	plugins/provisioners/chef/provisioner/base.rb
v1.2.4