From 5ef6c1d8a278f317d655cc5f259ff85e6048f06a Mon Sep 17 00:00:00 2001 From: fjy Date: Mon, 4 Nov 2013 12:33:36 -0800 Subject: [PATCH 01/11] fix formatting with modules doc --- docs/content/Modules.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/content/Modules.md b/docs/content/Modules.md index 314e7d9eca2..1641f4df5e2 100644 --- a/docs/content/Modules.md +++ b/docs/content/Modules.md @@ -36,8 +36,11 @@ If you want to take advantage of the maven-based classloader isolation but you a The trick to doing this is 1) Specify a local directory for `druid.extensions.localRepository` + 2) Run the `tools pull-deps` command to pull all the specified dependencies down into your local repository + 3) Bundle up the local repository along with your other Druid stuff into whatever you use for a deployable artifact + 4) Run Your druid processes with `druid.extensions.remoteRepositories=[]` and a local repository set to wherever your bundled "local" repository is located The Druid processes will then only load up jars from the local repository and will not try to go out onto the internet to find the maven dependencies. From 76732c25f8c9897ab3221480399ca1810aed69ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Mon, 4 Nov 2013 14:07:43 -0800 Subject: [PATCH 02/11] increase timeout for slow machines and provide more descriptive error message --- .../java/io/druid/server/coordination/ServerManagerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java b/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java index f3483487c1d..013544dabf1 100644 --- a/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java +++ b/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java @@ -309,7 +309,7 @@ public class ServerManagerTest ) ); - queryNotifyLatch.await(25, TimeUnit.MILLISECONDS); + Assert.assertTrue("Operation must complete within 100ms", queryNotifyLatch.await(100, TimeUnit.MILLISECONDS)); Assert.assertEquals(1, factory.getSegmentReferences().size()); From 0627c74e0d733561a5c80eca7a12535ba8da5d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 5 Nov 2013 15:07:19 -0800 Subject: [PATCH 03/11] rename index page to simplify docs url to /docs// --- docs/content/{Home.md => index.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/content/{Home.md => index.md} (100%) diff --git a/docs/content/Home.md b/docs/content/index.md similarity index 100% rename from docs/content/Home.md rename to docs/content/index.md From 6ee917b770c9f05b014231f85b206276e726535b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 5 Nov 2013 15:20:55 -0800 Subject: [PATCH 04/11] smarter deploy script --- docs/_bin/deploy-docs.sh | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/docs/_bin/deploy-docs.sh b/docs/_bin/deploy-docs.sh index f29fe15a5df..9c8c136f0c0 100755 --- a/docs/_bin/deploy-docs.sh +++ b/docs/_bin/deploy-docs.sh @@ -1,21 +1,21 @@ #! /bin/bash -e - -SCRIPT_DIR=`dirname $0` -pushd $SCRIPT_DIR -SCRIPT_DIR=`pwd` -popd +SCRIPT_DIR=$(cd $(dirname "$0") && pwd) if [ -z ${1} ]; then - pushd $SCRIPT_DIR - VERSION=`cat ../../pom.xml | grep version | head -4 | tail -1 | sed 's_.*\([^<]*\).*_\1_'` - popd + VERSION=$(cat $SCRIPT_DIR/../../pom.xml | grep version | head -4 | tail -1 | sed 's_.*\([^<]*\).*_\1_') else VERSION=${1} fi -WORKING_DIR=/tmp/docs-deploy +#if [ -z "$(git tag -l "druid-$VERSION")" ] +if [ -z "$(git tag -l "druid-$VERSION")" ] && [ "$VERSION" != "latest" ]; then + echo "Version tag does not exist: druid-$VERSION" + exit 1; +fi -echo Using Version[${VERSION}] +WORKING_DIR=$(mktemp -d -t druid-docs-deploy) + +echo Using Version [${VERSION}] echo Script in [${SCRIPT_DIR}] echo Deploying to [${WORKING_DIR}] @@ -37,11 +37,8 @@ BRANCH=docs-${VERSION} pushd ${WORKING_DIR} git checkout -b ${BRANCH} git add . -git commit -m "Deploy new docs version ${VERSION}" +git commit -m "Deploy ${VERSION} docs" git push origin ${BRANCH} popd rm -rf ${WORKING_DIR} - - - From 33561031a2a52a270a7fbed648150a80fb1f4f47 Mon Sep 17 00:00:00 2001 From: fjy Date: Tue, 5 Nov 2013 15:30:41 -0800 Subject: [PATCH 05/11] update docs version to match next release --- build.sh | 2 +- docs/content/Booting-a-production-cluster.md | 2 +- docs/content/Configuration.md | 2 +- docs/content/Download.md | 2 +- docs/content/Examples.md | 4 ++-- docs/content/Realtime.md | 4 ++-- docs/content/Tutorial:-A-First-Look-at-Druid.md | 4 ++-- docs/content/Tutorial:-Loading-Your-Data-Part-2.md | 2 +- docs/content/Tutorial:-The-Druid-Cluster.md | 2 +- docs/content/Tutorial:-Webstream.md | 4 ++-- docs/content/Twitter-Tutorial.textile | 2 +- services/src/main/java/io/druid/cli/CliCoordinator.java | 2 +- services/src/main/java/io/druid/cli/CliHadoopIndexer.java | 2 +- services/src/main/java/io/druid/cli/CliHistorical.java | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build.sh b/build.sh index 566b031d09f..38b5d81615c 100755 --- a/build.sh +++ b/build.sh @@ -30,4 +30,4 @@ echo "For examples, see: " echo " " ls -1 examples/*/*sh echo " " -echo "See also http://druid.io/docs/0.6.0/Home.html" +echo "See also http://druid.io/docs/0.6.1/Home.html" diff --git a/docs/content/Booting-a-production-cluster.md b/docs/content/Booting-a-production-cluster.md index d81f5f0b001..ab45c4251a6 100644 --- a/docs/content/Booting-a-production-cluster.md +++ b/docs/content/Booting-a-production-cluster.md @@ -3,7 +3,7 @@ layout: doc_page --- # Booting a Single Node Cluster # -[Loading Your Data](Tutorial%3A-Loading-Your-Data-Part-2.html) and [All About Queries](Tutorial%3A-All-About-Queries.html) contain recipes to boot a small druid cluster on localhost. Here we will boot a small cluster on EC2. You can checkout the code, or download a tarball from [here](http://static.druid.io/artifacts/druid-services-0.6.0-bin.tar.gz). +[Loading Your Data](Tutorial%3A-Loading-Your-Data-Part-2.html) and [All About Queries](Tutorial%3A-All-About-Queries.html) contain recipes to boot a small druid cluster on localhost. Here we will boot a small cluster on EC2. You can checkout the code, or download a tarball from [here](http://static.druid.io/artifacts/druid-services-0.6.1-bin.tar.gz). The [ec2 run script](https://github.com/metamx/druid/blob/master/examples/bin/run_ec2.sh), run_ec2.sh, is located at 'examples/bin' if you have checked out the code, or at the root of the project if you've downloaded a tarball. The scripts rely on the [Amazon EC2 API Tools](http://aws.amazon.com/developertools/351), and you will need to set three environment variables: diff --git a/docs/content/Configuration.md b/docs/content/Configuration.md index 533d9a00b79..7fa1b8d8a92 100644 --- a/docs/content/Configuration.md +++ b/docs/content/Configuration.md @@ -15,7 +15,7 @@ There are three JVM parameters that we set on all of our processes: Modules ======= -As of Druid v0.6.0, most core Druid functionality has been compartmentalized into modules. There are a set of default modules that may apply to any node type, and there are specific modules for the different node types. Default modules are __lazily instantiated__. Each module has its own set of configuration. This page will describe the configuration of the default modules. +As of Druid v0.6.1, most core Druid functionality has been compartmentalized into modules. There are a set of default modules that may apply to any node type, and there are specific modules for the different node types. Default modules are __lazily instantiated__. Each module has its own set of configuration. This page will describe the configuration of the default modules. Configuration of the various modules is done via Java properties. These can either be provided as `-D` system properties on the java command line or they can be passed in via a file called `runtime.properties` that exists on the classpath. diff --git a/docs/content/Download.md b/docs/content/Download.md index ceec5395e45..0b8a1bfcf7d 100644 --- a/docs/content/Download.md +++ b/docs/content/Download.md @@ -6,7 +6,7 @@ A version may be declared as a release candidate if it has been deployed to a si Release Candidate ----------------- -The current release candidate is tagged at version [0.6.0](https://github.com/metamx/druid/tree/druid-0.6.0). +The current release candidate is tagged at version [0.6.1](https://github.com/metamx/druid/tree/druid-0.6.1). Stable Release -------------- diff --git a/docs/content/Examples.md b/docs/content/Examples.md index 56382c70304..a889c3ba627 100644 --- a/docs/content/Examples.md +++ b/docs/content/Examples.md @@ -19,13 +19,13 @@ Clone Druid and build it: git clone https://github.com/metamx/druid.git druid cd druid git fetch --tags -git checkout druid-0.6.0 +git checkout druid-0.6.1 ./build.sh ``` ### Downloading the DSK (Druid Standalone Kit) -[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.0-bin.tar.gz) a stand-alone tarball and run it: +[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.1-bin.tar.gz) a stand-alone tarball and run it: ``` bash tar -xzf druid-services-0.X.X-bin.tar.gz diff --git a/docs/content/Realtime.md b/docs/content/Realtime.md index 61a9bf0e3ce..6bed5ea1f53 100644 --- a/docs/content/Realtime.md +++ b/docs/content/Realtime.md @@ -187,8 +187,8 @@ Extending the code Realtime integration is intended to be extended in two ways: -1. Connect to data streams from varied systems ([Firehose](https://github.com/metamx/druid/blob/druid-0.6.0/realtime/src/main/java/com/metamx/druid/realtime/firehose/FirehoseFactory.java)) -2. Adjust the publishing strategy to match your needs ([Plumber](https://github.com/metamx/druid/blob/druid-0.6.0/realtime/src/main/java/com/metamx/druid/realtime/plumber/PlumberSchool.java)) +1. Connect to data streams from varied systems ([Firehose](https://github.com/metamx/druid/blob/druid-0.6.1/realtime/src/main/java/com/metamx/druid/realtime/firehose/FirehoseFactory.java)) +2. Adjust the publishing strategy to match your needs ([Plumber](https://github.com/metamx/druid/blob/druid-0.6.1/realtime/src/main/java/com/metamx/druid/realtime/plumber/PlumberSchool.java)) The expectations are that the former will be very common and something that users of Druid will do on a fairly regular basis. Most users will probably never have to deal with the latter form of customization. Indeed, we hope that all potential use cases can be packaged up as part of Druid proper without requiring proprietary customization. diff --git a/docs/content/Tutorial:-A-First-Look-at-Druid.md b/docs/content/Tutorial:-A-First-Look-at-Druid.md index 71cb52739d5..257e286c0b0 100644 --- a/docs/content/Tutorial:-A-First-Look-at-Druid.md +++ b/docs/content/Tutorial:-A-First-Look-at-Druid.md @@ -47,7 +47,7 @@ There are two ways to setup Druid: download a tarball, or [Build From Source](Bu ### Download a Tarball -We've built a tarball that contains everything you'll need. You'll find it [here](http://static.druid.io/artifacts/releases/druid-services-0.6.0-bin.tar.gz). Download this file to a directory of your choosing. +We've built a tarball that contains everything you'll need. You'll find it [here](http://static.druid.io/artifacts/releases/druid-services-0.6.1-bin.tar.gz). Download this file to a directory of your choosing. You can extract the awesomeness within by issuing: @@ -58,7 +58,7 @@ tar -zxvf druid-services-*-bin.tar.gz Not too lost so far right? That's great! If you cd into the directory: ``` -cd druid-services-0.6.0 +cd druid-services-0.6.1 ``` You should see a bunch of files: diff --git a/docs/content/Tutorial:-Loading-Your-Data-Part-2.md b/docs/content/Tutorial:-Loading-Your-Data-Part-2.md index e57aab5821e..37bab0cee27 100644 --- a/docs/content/Tutorial:-Loading-Your-Data-Part-2.md +++ b/docs/content/Tutorial:-Loading-Your-Data-Part-2.md @@ -42,7 +42,7 @@ With real-world data, we recommend having a message bus such as [Apache Kafka](h #### Setting up Kafka -[KafkaFirehoseFactory](https://github.com/metamx/druid/blob/druid-0.6.0/realtime/src/main/java/com/metamx/druid/realtime/firehose/KafkaFirehoseFactory.java) is how druid communicates with Kafka. Using this [Firehose](Firehose.html) with the right configuration, we can import data into Druid in real-time without writing any code. To load data to a real-time node via Kafka, we'll first need to initialize Zookeeper and Kafka, and then configure and initialize a [Realtime](Realtime.html) node. +[KafkaFirehoseFactory](https://github.com/metamx/druid/blob/druid-0.6.1/realtime/src/main/java/com/metamx/druid/realtime/firehose/KafkaFirehoseFactory.java) is how druid communicates with Kafka. Using this [Firehose](Firehose.html) with the right configuration, we can import data into Druid in real-time without writing any code. To load data to a real-time node via Kafka, we'll first need to initialize Zookeeper and Kafka, and then configure and initialize a [Realtime](Realtime.html) node. Instructions for booting a Zookeeper and then Kafka cluster are available [here](http://kafka.apache.org/07/quickstart.html). diff --git a/docs/content/Tutorial:-The-Druid-Cluster.md b/docs/content/Tutorial:-The-Druid-Cluster.md index 31a87cb0bb2..afdacf1bdab 100644 --- a/docs/content/Tutorial:-The-Druid-Cluster.md +++ b/docs/content/Tutorial:-The-Druid-Cluster.md @@ -11,7 +11,7 @@ In this tutorial, we will set up other types of Druid nodes as well as and exter If you followed the first tutorial, you should already have Druid downloaded. If not, let's go back and do that first. -You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-services-0.6.0-bin.tar.gz) +You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-services-0.6.1-bin.tar.gz) and untar the contents within by issuing: diff --git a/docs/content/Tutorial:-Webstream.md b/docs/content/Tutorial:-Webstream.md index e57aa0e19d9..c51a907264d 100644 --- a/docs/content/Tutorial:-Webstream.md +++ b/docs/content/Tutorial:-Webstream.md @@ -37,7 +37,7 @@ There are two ways to setup Druid: download a tarball, or [Build From Source](Bu h3. Download a Tarball -We've built a tarball that contains everything you'll need. You'll find it [here](http://static.druid.io/artifacts/releases/druid-services-0.6.0-bin.tar.gz) +We've built a tarball that contains everything you'll need. You'll find it [here](http://static.druid.io/artifacts/releases/druid-services-0.6.1-bin.tar.gz) Download this file to a directory of your choosing. You can extract the awesomeness within by issuing: @@ -48,7 +48,7 @@ tar zxvf druid-services-*-bin.tar.gz Not too lost so far right? That's great! If you cd into the directory: ``` -cd druid-services-0.6.0 +cd druid-services-0.6.1 ``` You should see a bunch of files: diff --git a/docs/content/Twitter-Tutorial.textile b/docs/content/Twitter-Tutorial.textile index 4948e9d36c5..8f5ae492e1a 100644 --- a/docs/content/Twitter-Tutorial.textile +++ b/docs/content/Twitter-Tutorial.textile @@ -9,7 +9,7 @@ There are two ways to setup Druid: download a tarball, or build it from source. h3. Download a Tarball -We've built a tarball that contains everything you'll need. You'll find it "here":http://static.druid.io/artifacts/releases/druid-services-0.6.0-bin.tar.gz. +We've built a tarball that contains everything you'll need. You'll find it "here":http://static.druid.io/artifacts/releases/druid-services-0.6.1-bin.tar.gz. Download this bad boy to a directory of your choosing. You can extract the awesomeness within by issuing: diff --git a/services/src/main/java/io/druid/cli/CliCoordinator.java b/services/src/main/java/io/druid/cli/CliCoordinator.java index dc6d695f6e0..4db5c566fb0 100644 --- a/services/src/main/java/io/druid/cli/CliCoordinator.java +++ b/services/src/main/java/io/druid/cli/CliCoordinator.java @@ -63,7 +63,7 @@ import java.util.List; */ @Command( name = "coordinator", - description = "Runs the Coordinator, see http://druid.io/docs/0.6.0/Coordinator.html for a description." + description = "Runs the Coordinator, see http://druid.io/docs/0.6.1/Coordinator.html for a description." ) public class CliCoordinator extends ServerRunnable { diff --git a/services/src/main/java/io/druid/cli/CliHadoopIndexer.java b/services/src/main/java/io/druid/cli/CliHadoopIndexer.java index 489d8951f0d..2a4b20c45a4 100644 --- a/services/src/main/java/io/druid/cli/CliHadoopIndexer.java +++ b/services/src/main/java/io/druid/cli/CliHadoopIndexer.java @@ -41,7 +41,7 @@ import java.util.List; */ @Command( name = "hadoop", - description = "Runs the batch Hadoop Druid Indexer, see http://druid.io/docs/0.6.0/Batch-ingestion.html for a description." + description = "Runs the batch Hadoop Druid Indexer, see http://druid.io/docs/0.6.1/Batch-ingestion.html for a description." ) public class CliHadoopIndexer implements Runnable { diff --git a/services/src/main/java/io/druid/cli/CliHistorical.java b/services/src/main/java/io/druid/cli/CliHistorical.java index 2e32855f1e1..d3c4373a35e 100644 --- a/services/src/main/java/io/druid/cli/CliHistorical.java +++ b/services/src/main/java/io/druid/cli/CliHistorical.java @@ -42,7 +42,7 @@ import java.util.List; */ @Command( name = "historical", - description = "Runs a Historical node, see http://druid.io/docs/0.6.0/Historical.html for a description" + description = "Runs a Historical node, see http://druid.io/docs/0.6.1/Historical.html for a description" ) public class CliHistorical extends ServerRunnable { From 6a6be1c3aba75a015d1ff66e3c81b19e4567927c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 5 Nov 2013 15:32:34 -0800 Subject: [PATCH 06/11] fix broken links --- docs/content/contents.textile | 2 +- docs/content/toc.textile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/contents.textile b/docs/content/contents.textile index 9bbe27dc50a..323c1425e02 100644 --- a/docs/content/contents.textile +++ b/docs/content/contents.textile @@ -1,7 +1,7 @@ --- --- -* [Introduction|Home](Introduction|Home.html) +* [Introduction|Home](Introduction|./) * [Download](Download.html) * [Support](Support.html) * [Contribute](Contribute.html) diff --git a/docs/content/toc.textile b/docs/content/toc.textile index 7abe247cb00..2674a7ce23f 100644 --- a/docs/content/toc.textile +++ b/docs/content/toc.textile @@ -4,7 +4,7 @@ h1. Contents -* "Introduction":./Home.html +* "Introduction":./ * "Download":./Download.html * "Support":./Support.html * "Contribute":./Contribute.html From 713015199a055fd138fe10f2497dd5e78e9a13cf Mon Sep 17 00:00:00 2001 From: fjy Date: Tue, 5 Nov 2013 15:42:33 -0800 Subject: [PATCH 07/11] [maven-release-plugin] prepare release druid-0.6.1 --- cassandra-storage/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- hdfs-storage/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 5 +++-- processing/pom.xml | 2 +- s3-extensions/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 11 files changed, 14 insertions(+), 13 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index 18bb069e6db..a3f5355d112 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1-SNAPSHOT + 0.6.1 diff --git a/common/pom.xml b/common/pom.xml index b4db9d5c930..78e5264d501 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1-SNAPSHOT + 0.6.1 diff --git a/examples/pom.xml b/examples/pom.xml index a4f4787cc10..f18cb31ae6a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1-SNAPSHOT + 0.6.1 diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 268d860dc3c..6f415aa7d8b 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1-SNAPSHOT + 0.6.1 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index d2cc2b9fda7..1ca9314d66e 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1-SNAPSHOT + 0.6.1 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 3d95d4245e0..88155294505 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1-SNAPSHOT + 0.6.1 diff --git a/pom.xml b/pom.xml index 84d1b4cd7c7..f60444a3ba6 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,15 @@ io.druid druid pom - 0.6.1-SNAPSHOT + 0.6.1 druid druid scm:git:ssh://git@github.com/metamx/druid.git scm:git:ssh://git@github.com/metamx/druid.git http://www.github.com/metamx/druid - + druid-0.6.1 + 3.0.3 diff --git a/processing/pom.xml b/processing/pom.xml index 53f89a65322..c65e03fc89f 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1-SNAPSHOT + 0.6.1 diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 02e776eb7ca..c5569ab0454 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1-SNAPSHOT + 0.6.1 diff --git a/server/pom.xml b/server/pom.xml index e415ece6a97..061c61b0eb7 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1-SNAPSHOT + 0.6.1 diff --git a/services/pom.xml b/services/pom.xml index 3d7bef551fd..ae4ca728625 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -23,11 +23,11 @@ druid-services druid-services druid-services - 0.6.1-SNAPSHOT + 0.6.1 io.druid druid - 0.6.1-SNAPSHOT + 0.6.1 From ee15fd9f85baa2bfdc15051c28693ba459de0062 Mon Sep 17 00:00:00 2001 From: fjy Date: Tue, 5 Nov 2013 15:42:37 -0800 Subject: [PATCH 08/11] [maven-release-plugin] prepare for next development iteration --- cassandra-storage/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- hdfs-storage/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 4 ++-- processing/pom.xml | 2 +- s3-extensions/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index a3f5355d112..95ebcbcfd0e 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1 + 0.6.2-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 78e5264d501..6c399e4ae6d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1 + 0.6.2-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index f18cb31ae6a..52dc61c5850 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1 + 0.6.2-SNAPSHOT diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 6f415aa7d8b..fe121715801 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1 + 0.6.2-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 1ca9314d66e..f7a7e496fdc 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1 + 0.6.2-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 88155294505..f769d78f0b4 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1 + 0.6.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index f60444a3ba6..340b3c36988 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.1 + 0.6.2-SNAPSHOT druid druid scm:git:ssh://git@github.com/metamx/druid.git scm:git:ssh://git@github.com/metamx/druid.git http://www.github.com/metamx/druid - druid-0.6.1 + HEAD diff --git a/processing/pom.xml b/processing/pom.xml index c65e03fc89f..a0c5d1a6b03 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1 + 0.6.2-SNAPSHOT diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index c5569ab0454..3615becf4da 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1 + 0.6.2-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 061c61b0eb7..73e929969f9 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.1 + 0.6.2-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index ae4ca728625..fbf2d9ffa71 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -23,11 +23,11 @@ druid-services druid-services druid-services - 0.6.1 + 0.6.2-SNAPSHOT io.druid druid - 0.6.1 + 0.6.2-SNAPSHOT From f07b4fe59bd95185d5a83bc706cb6b042e8dc1e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 5 Nov 2013 15:50:38 -0800 Subject: [PATCH 09/11] remove unused file --- docs/content/contents.textile | 78 ----------------------------------- 1 file changed, 78 deletions(-) delete mode 100644 docs/content/contents.textile diff --git a/docs/content/contents.textile b/docs/content/contents.textile deleted file mode 100644 index 323c1425e02..00000000000 --- a/docs/content/contents.textile +++ /dev/null @@ -1,78 +0,0 @@ ---- ---- - -* [Introduction|Home](Introduction|./) -* [Download](Download.html) -* [Support](Support.html) -* [Contribute](Contribute.html) -======================== - -Getting Started -* [Tutorial: A First Look at Druid](Tutorial:-A-First-Look-at-Druid.html) -* [Tutorial: The Druid Cluster](Tutorial:-The-Druid-Cluster.html) -* [Tutorial: Loading Your Data Part 1](Tutorial:-Loading-Your-Data-Part-1.html) -* [Tutorial: Loading Your Data Part 2](Tutorial:-Loading-Your-Data-Part-2.html) -* [Tutorial: All About Queries](Tutorial:-All-About-Queries.html) --------------------------------------- - -Evaluate Druid -* [Cluster Setup](Cluster-setup.html) -* [Booting a Production Cluster](Booting-a-production-cluster.html) --------------------------------------- - -Configuration -* [Configuration](Configuration.html) -------------------------------------- - -Data Ingestion -* [Realtime](Realtime.html) -* [Batch Ingestion](Batch-ingestion.html) -* [Indexing Service](Indexing-Service.html) -*** ] -*** [Tasks](Tasks.html) ----------------------------- - -Querying -* [Querying](Querying.html) -*** ] -*** [Aggregations](Aggregations.html) -*** ] -*** [Granularities](Granularities.html) -* Query Types -*** ] -***** ] -***** ] -*** [SearchQuery](SearchQuery.html) -*** ] -** [SegmentMetadataQuery](SegmentMetadataQuery.html) -*** ] -*** [TimeseriesQuery](TimeseriesQuery.html) ---------------------------- - -Architecture -* [Design](Design.html) -* [Segments](Segments.html) -* Node Types -*** ] -*** [Broker](Broker.html) -*** ] -***** ] -*** [Realtime](Realtime.html) -*** ] -*** [Plumber](Plumber.html) -* External Dependencies -*** ] -*** [MySQL](MySQL.html) -*** ] -** [Concepts and Terminology](Concepts-and-Terminology.html) -------------------------------- - -Development -* [Versioning](Versioning.html) -* [Build From Source](Build-From-Source.html) -* [Libraries](Libraries.html) ------------------------- - -Misc -* [Thanks](Thanks.html) -------------- From efd7ea048651c17ba2b5079cfdfee61435ea3daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 5 Nov 2013 15:51:34 -0800 Subject: [PATCH 10/11] fix broken link when testing locally --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 844b49e4ee2..fa25c836698 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,6 +2,6 @@ - + From f77fbfcfe7b17acd132d0b2517f550eec4e50eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Thu, 7 Nov 2013 13:40:54 -0800 Subject: [PATCH 11/11] do not deploy layout --- docs/_bin/deploy-docs.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/_bin/deploy-docs.sh b/docs/_bin/deploy-docs.sh index 9c8c136f0c0..0051a4f1a18 100755 --- a/docs/_bin/deploy-docs.sh +++ b/docs/_bin/deploy-docs.sh @@ -28,7 +28,6 @@ git clone git@github.com:druid-io/druid-io.github.io.git ${WORKING_DIR} DOC_DIR=${WORKING_DIR}/docs/${VERSION}/ -cp ${SCRIPT_DIR}/../_layouts/doc* ${WORKING_DIR}/_layouts/ mkdir -p ${DOC_DIR} cp -r ${SCRIPT_DIR}/../content/* ${DOC_DIR}