Merge pull request #669 from opdemand/carmstrong/fix_berksfile

Let berkshelf resolve dependencies itself

Author: carmstrong

.gitignore

@@ -45,6 +45,7 @@ controller/.secret_key
 logs/
 
 # Misc.
+Berksfile.lock
 .DS_Store
 htmlcov/
 .ruby-version

Berksfile

@@ -1,10 +1,4 @@
-site :opscode
-
-cookbook 'apt'
-cookbook 'docker'
-cookbook 'rsyslog'
-cookbook 'sudo'
-#cookbook 'deis', '~> 0.6.0'
-
-# development cookbook
+# TODO Once we have a good release cadence and are publishing cookbook versions
+# regularly, this should be locked to a particular version. Until then, always
+# use the most freshly-baked version.
 cookbook 'deis', git: 'https://github.com/opdemand/deis-cookbook.git', branch: 'master'