summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-06-24 11:55:17 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2014-06-24 11:55:17 -0700
commitb4c75ef9d7ea94f3d89e9523910441be4abb435b (patch)
treed45168e26180ac21ee4ec1a8b66d4704ba6ccd64
parent5aa786acab076b1cec48f8a2ddf418dee2a58b70 (diff)
downloadffi-yajl-b4c75ef9d7ea94f3d89e9523910441be4abb435b.tar.gz
add license + thanks
-rw-r--r--MIT-LICENSE22
-rw-r--r--README.md10
2 files changed, 28 insertions, 4 deletions
diff --git a/MIT-LICENSE b/MIT-LICENSE
new file mode 100644
index 0000000..2950eee
--- /dev/null
+++ b/MIT-LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2014 Lamont Granquist
+Copyright (c) 2014 Chef Software, Inc.
+Copyright (c) 2008-2011 Brian Lopez - http://github.com/brianmario
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index b435f22..6b7514a 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,15 @@
## TODO
-- fix int conversion issue in chef specs in c extension
## BUILD NOTES
-- building libyajl2 requires 'apt-get install cmake' on ubuntu, but note
- that 'apt-get install libyajl2' will be better
## KNOWN BUGS
-- 'rake compile' broken on mac, only tested to work on linux (ubuntu)
+
+## Thanks
+
+This was initially going to be a clean rewrite of an ffi ruby wrapper, but as it progressed more code was pulled in from brianmario's existing
+yajl-ruby gem, particularly all the c extension code, lots of specs and the benchmarks.
+