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/da5600c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/da5600c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/da5600c5 Branch: refs/heads/master Commit: da5600c5d02992296d65d674febcc8d0033c792f Parents: cf21011 3cbfe13 Author: Aaron McCurry <[email protected]> Authored: Tue Nov 11 20:01:27 2014 -0500 Committer: Aaron McCurry <[email protected]> Committed: Tue Nov 11 20:01:27 2014 -0500 ---------------------------------------------------------------------- docs/cluster-setup.base.html | 1 + docs/cluster-setup.html | 1 + docs/console.html | 1 + docs/data-model.html | 1 + docs/getting-started.html | 1 + docs/index.html | 1 + docs/platform.html | 227 ++++++++++++++++++++++++++++++++++ docs/release-notes.html | 1 + docs/release-notes.template.html | 1 + docs/template.html | 8 +- docs/using-blur.base.html | 1 + docs/using-blur.html | 1 + 12 files changed, 243 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
