Merge branch 'master' into druid-0.7.x

Conflicts:
	README.md

README.md

@@ -4,8 +4,8 @@ Druid is a distributed, column-oriented, real-time analytics data store that is
 commonly used to power exploratory dashboards in multi-tenant environments.
 Druid excels as a data warehousing solution for fast aggregate queries on
 petabyte sized data sets. Druid supports a variety of flexible filters, exact
-calculations, approximate algorithms, and other tools commonly found in the
+calculations, approximate algorithms, and other useful calculations Druid can
-business intelligence space. Druid can load both streaming and batch data.
+load both streaming and batch data and integrates with Storm and Hadoop.
 
 ### More Information
 Much more information about Druid can be found on our [website](http://www.druid.io).

build.sh

@@ -25,9 +25,3 @@ echo " "
 echo "        The following self-contained jars (and more) have been built:"
 echo " "
 find . -name '*-selfcontained.jar'
-echo " "
-echo "For examples, see: "
-echo " "
-ls -1 examples/*/*sh
-echo " "
-echo "See also http://druid.io/docs/latest"

docs/_bin/deploy-docs.sh

@@ -1,43 +1,55 @@
 #! /bin/bash -e
-SCRIPT_DIR=$(cd $(dirname "$0") && pwd)
 
-if [ -z ${1} ]; then 
+if [ -z "$1" ]; then 
-    VERSION=$(cat $SCRIPT_DIR/../../pom.xml | grep version | head -4 | tail -1 | sed 's_.*<version>\([^<]*\)</version>.*_\1_')
+    version="latest"
 else
-    VERSION=${1}
+    version=$1
 fi
 
-#if [ -z "$(git tag -l "druid-$VERSION")" ]
+docs=$(git -C "$(dirname "$0")" rev-parse --show-toplevel)/docs
-if [ -z "$(git tag -l "druid-$VERSION")" ] && [ "$VERSION" != "latest" ]; then
+
-  echo "Version tag does not exist: druid-$VERSION"
+if [ -n "$(git -C "$docs" status --porcelain --untracked-files=no content)" ]; then
+  echo "Docs directory is not clean, aborting"
+  exit 1
+fi
+
+if [ -z "$(git tag -l "druid-$version")" ] && [ "$version" != "latest" ]; then
+  echo "Version tag does not exist: druid-$version"
   exit 1;
 fi
 
-WORKING_DIR=$(mktemp -d -t druid-docs-deploy)
+tmp=$(mktemp -d -t druid-docs-deploy)
 
-echo Using Version [${VERSION}]
+echo "Using Version     [$version]"
-echo Script in [${SCRIPT_DIR}]
+echo "Working directory [$tmp]"
-echo Deploying to [${WORKING_DIR}]
 
-if [ -d ${WORKING_DIR} ]; then
+git clone git@github.com:druid-io/druid-io.github.io.git "$tmp"
-    echo DELETING ${WORKING_DIR}
+
-    rm -rf ${WORKING_DIR}
+target=$tmp/docs/$version
+
+mkdir -p $target
+rsync -a --delete "$docs/content/" $target
+
+branch=update-docs-$version
+
+git -C $tmp checkout  -b $branch
+git -C $tmp add -A .
+git -C $tmp commit -m "Update $version docs"
+git -C $tmp push origin $branch
+
+if [ -n "$GIT_TOKEN" ]; then
+curl -u "$GIT_TOKEN:x-oauth-basic" -XPOST -d@- \
+     https://api.github.com/repos/druid-io/druid-io.github.io/pulls <<EOF
+{
+  "title" : "Update $version docs",
+  "head"  : "$branch",
+  "base"  : "master"
+}
+EOF
+
+else
+  echo "GitHub personal token not provided, not submitting pull request"
+  echo "Please go to https://github.com/druid-io/druid-io.github.io and submit a pull request from the \`$branch\` branch"
 fi
 
-git clone git@github.com:druid-io/druid-io.github.io.git ${WORKING_DIR}
+rm -rf $tmp
-
-DOC_DIR=${WORKING_DIR}/docs/${VERSION}/
-
-mkdir -p ${DOC_DIR}
-cp -r ${SCRIPT_DIR}/../content/* ${DOC_DIR}
-
-BRANCH=docs-${VERSION}
-
-pushd ${WORKING_DIR}
-git checkout -b ${BRANCH}
-git add .
-git commit -m "Deploy ${VERSION} docs"
-git push origin ${BRANCH}
-popd
-
-rm -rf ${WORKING_DIR}

docs/content/Querying.md

@@ -1,12 +1,17 @@
 ---
 layout: doc_page
 ---
+
 Querying
 ========
 
-Queries are made using an HTTP REST style request to a [Broker](Broker.html), [Historical](Historical.html), or [Realtime](Realtime.html) node. The query is expressed in JSON and each of these node types expose the same REST query interface.
+Queries are made using an HTTP REST style request to a [Broker](Broker.html),
+[Historical](Historical.html), or [Realtime](Realtime.html) node. The
+query is expressed in JSON and each of these node types expose the same
+REST query interface.
 
-We start by describing an example query with additional comments that mention possible variations. Query operators are also summarized in a table below.
+We start by describing an example query with additional comments that mention
+possible variations. Query operators are also summarized in a table below.
 
 Example Query "rand"
 --------------------
@@ -145,7 +150,7 @@ Query Cancellation
 ------------------
 
 Queries can be cancelled explicitely using their unique identifier.  If the
-query identifier is set at the time of query, or is known, the following
+query identifier is set at the time of query, or is otherwise known, the following
 endpoint can be used on the broker or router to cancel the query.
 
 ```sh

docs/css/blogs.css

@@ -1,14 +0,0 @@
-.blog-listing {
-   margin-bottom: 70px;
-}
-
-.blog-entry {
-   margin-bottom: 70px;
-}
-
-.recents ul li {
-   font-weight: 400;
-   margin-bottom: 15px;
-}
-
-

docs/css/index.css

@@ -1,12 +0,0 @@
-.main-marketing {
-  padding: 30px 0 30px 0;
-}
-
-.main-marketing a {
-   color: #333;
-}
-
-.main-marketing h2 {
-   margin-top: 20px;
-   font-weight: 400;
-}