summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Walters <cw@opscode.com>2010-06-23 13:16:44 -0700
committerChris Walters <cw@opscode.com>2010-06-23 13:16:58 -0700
commitf92d3025243d4090c79628244a74f55153ed2a38 (patch)
tree574a666252c127544dacd14e60c66e48124e2d97
parent9421a16ad648cebf5a241e84b8abca830d1043a5 (diff)
downloadchef-f92d3025243d4090c79628244a74f55153ed2a38.tar.gz
Fixing up some dependencies
-rw-r--r--chef/lib/chef/api_client.rb1
-rw-r--r--chef/lib/chef/log.rb2
-rw-r--r--chef/lib/chef/streaming_cookbook_uploader.rb1
3 files changed, 3 insertions, 1 deletions
diff --git a/chef/lib/chef/api_client.rb b/chef/lib/chef/api_client.rb
index cfafec8068..0dd7ee8042 100644
--- a/chef/lib/chef/api_client.rb
+++ b/chef/lib/chef/api_client.rb
@@ -19,6 +19,7 @@
require 'chef/config'
require 'chef/mixin/params_validate'
+require 'chef/mixin/from_file'
require 'chef/couchdb'
require 'chef/certificate'
require 'chef/index_queue'
diff --git a/chef/lib/chef/log.rb b/chef/lib/chef/log.rb
index 582c0892e1..ffdd088577 100644
--- a/chef/lib/chef/log.rb
+++ b/chef/lib/chef/log.rb
@@ -17,7 +17,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-require 'chef'
+require 'logger'
require 'mixlib/log'
class Chef
diff --git a/chef/lib/chef/streaming_cookbook_uploader.rb b/chef/lib/chef/streaming_cookbook_uploader.rb
index 1e1bb8f4dc..df90e0003d 100644
--- a/chef/lib/chef/streaming_cookbook_uploader.rb
+++ b/chef/lib/chef/streaming_cookbook_uploader.rb
@@ -9,6 +9,7 @@
require 'net/http'
require 'mixlib/authentication/signedheaderauth'
require 'openssl'
+require 'chef/version'
class Chef
class StreamingCookbookUploader