Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/d9f51871 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/d9f51871 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/d9f51871 Branch: refs/heads/master Commit: d9f51871c12cdebcb2799d516c0999c2c8362c14 Parents: 5e41747 4cfcce3 Author: Aaron McCurry <[email protected]> Authored: Tue Aug 27 08:34:27 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Tue Aug 27 08:34:27 2013 -0400 ---------------------------------------------------------------------- LICENSE | 481 +++++-------------- NOTICE | 39 +- .../src/main/resources/license-bin.noinclude | 43 ++ .../src/main/resources/license-notes.txt | 14 + 4 files changed, 174 insertions(+), 403 deletions(-) ----------------------------------------------------------------------
