Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:metamx/druid

This commit is contained in:
Eric Tschetter 2013-02-01 18:39:09 -06:00
parent 1a9edbebd3 7ec3563e7b
commit c63eb2b77b
13 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.2.3-SNAPSHOT</version> <version>0.2.4-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

4
client/src/main/java/com/metamx/druid/client/cache/MemcachedCacheConfig.java vendored
View File

@ -6,7 +6,7 @@ import org.skife.config.Default;
public abstract class MemcachedCacheConfig public abstract class MemcachedCacheConfig
{ {
@Config("${prefix}.expiration") @Config("${prefix}.expiration")
@Default("31536000") @Default("2592000")
public abstract int getExpiration(); public abstract int getExpiration();
@Config("${prefix}.timeout") @Config("${prefix}.timeout")
@ -17,8 +17,10 @@ public abstract class MemcachedCacheConfig
public abstract String getHosts(); public abstract String getHosts();
@Config("${prefix}.maxObjectSize") @Config("${prefix}.maxObjectSize")
@Default("52428800")
public abstract int getMaxObjectSize(); public abstract int getMaxObjectSize();
@Config("${prefix}.memcachedPrefix") @Config("${prefix}.memcachedPrefix")
@Default("druid")
public abstract String getMemcachedPrefix(); public abstract String getMemcachedPrefix();
} }

2
common/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.2.3-SNAPSHOT</version> <version>0.2.4-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

4
druid-services/pom.xml
View File

@ -24,11 +24,11 @@
<artifactId>druid-services</artifactId> <artifactId>druid-services</artifactId>
<name>druid-services</name> <name>druid-services</name>
<description>druid-services</description> <description>druid-services</description>
<version>0.2.3-SNAPSHOT</version> <version>0.2.4-SNAPSHOT</version>
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.2.3-SNAPSHOT</version> <version>0.2.4-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
examples/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.2.3-SNAPSHOT</version> <version>0.2.4-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
examples/rand/pom.xml
View File

@ -9,7 +9,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid-examples</artifactId> <artifactId>druid-examples</artifactId>
<version>0.2.3-SNAPSHOT</version> <version>0.2.4-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
examples/twitter/pom.xml
View File

@ -9,7 +9,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid-examples</artifactId> <artifactId>druid-examples</artifactId>
<version>0.2.3-SNAPSHOT</version> <version>0.2.4-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
index-common/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.2.3-SNAPSHOT</version> <version>0.2.4-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
indexer/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.2.3-SNAPSHOT</version> <version>0.2.4-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
merger/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.2.3-SNAPSHOT</version> <version>0.2.4-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
pom.xml
View File

@ -23,7 +23,7 @@
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>0.2.3-SNAPSHOT</version> <version>0.2.4-SNAPSHOT</version>
<name>druid</name> <name>druid</name>
<description>druid</description> <description>druid</description>
<scm> <scm>

2
realtime/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.2.3-SNAPSHOT</version> <version>0.2.4-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

2
server/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.2.3-SNAPSHOT</version> <version>0.2.4-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>