Merge pull request #237 from jperville/deprecate-daemon-restart-option

Deprecate the 'restart' daemon option (obsolete since docker 1.2.0).

README.md

@@ -165,7 +165,7 @@ no_proxy | NO_PROXY environment variable | String | nil
 options | Additional options to pass to docker. These could be flags like "-api-enable-cors". | String | nil
 pidfile | Path to use for daemon PID file | String | nil (implicitly /var/run/docker.pid)
 ramdisk | Set DOCKER_RAMDISK when using RAM disk | TrueClass or FalseClass | false
-restart | Restart containers on boot | TrueClass or FalseClass | auto-detected (see attributes/default.rb)
+restart (*DEPRECATED*) | Restart containers on boot | TrueClass or FalseClass | auto-detected (see attributes/default.rb)
 selinux_enabled | Enable SELinux | TrueClass or FalseClass | nil
 storage_driver | Storage driver for docker | String | nil
 storage_opt | Storage driver options | String, Array | nil

attributes/default.rb

@@ -186,4 +186,5 @@
 
 # Other attributes
 
+# DEPRECATED: will be removed in chef-docker 1.0
 default['docker']['restart'] = false if node['docker']['container_init_type']

spec/systemd_spec.rb

@@ -87,6 +87,7 @@
     end
   end
 
+  # DEPRECATED: will be removed in chef-docker 1.0
   context 'when container_init_type is set' do
     let(:chef_run) do
       runner = ChefSpec::Runner.new

spec/sysv_spec.rb

@@ -98,6 +98,7 @@
     end
   end
 
+  # DEPRECATED: will be removed in chef-docker 1.0
   context 'when container_init_type is set' do
     let(:chef_run) do
       runner = ChefSpec::Runner.new

spec/upstart_spec.rb

@@ -99,6 +99,7 @@
     end
   end
 
+  # DEPRECATED: will be removed in chef-docker 1.0
   context 'when container_init_type is set' do
     let(:chef_run) do
       runner = ChefSpec::Runner.new