6877 - Vendored JSON isnt loaded correctly

Correct the path to the json/lib directory
puppetlabs · Mar 28, 2011 · 4679f6c · 4679f6c
1 parent abdfddf
commit 4679f6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/mcollective/vendor/load_json.rb b/lib/mcollective/vendor/load_json.rb
@@ -1 +1 @@
-$: << File.join([File.dirname(__FILE__), "systemu/json"])
+$: << File.join([File.dirname(__FILE__), "json/lib"])
diff --git a/website/changelog.md b/website/changelog.md
@@ -11,6 +11,7 @@ title: Changelog
 
 |Date|Description|Ticket|
 |----|-----------|------|
+|2011/03/28|Correct loading of vendored JSON gem|6877|
 |2011/03/28|Show collective and sub collective info in the inventory application|6872|
 |2011/03/23|Disconnect from the middleware when mcollectived disconnects|6821|
 |2011/03/21|Update rpcutil ddl file to be less strict about valid fact names|6764|