Merge branch 'AppLovin-yajl' into 1.5.0

owen · Jan 26, 2015 · f585c78 · f585c78
2 parents 4c5bbc3 + 7a835cf
commit f585c78
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/knife-spork/runner.rb b/lib/knife-spork/runner.rb
@@ -234,7 +234,7 @@ def load_environment(environment_name)
       def load_environment_from_file(environment_name)
         begin
           environment_loader.object_from_file("#{environment_path}/#{environment_name}.json")
-        rescue Yajl::ParseError => e
+        rescue FFI_Yajl::ParseError => e
           raise "#{environment_name} environment file has syntactically incorrect json.\n #{e.to_s}" 
         end
       end