incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [2/4] git commit: Changing the version in the code, removing SNAPSHOT.
Date Thu, 02 Jul 2015 23:44:58 GMT
Changing the version in the code, removing SNAPSHOT.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/e9156d50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/e9156d50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/e9156d50

Branch: refs/heads/apache-blur-0.2.4
Commit: e9156d50819cec296e17177575ff866f48e15458
Parents: 6f0523a
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Thu Jul 2 17:38:12 2015 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Thu Jul 2 17:38:12 2015 -0400

----------------------------------------------------------------------
 blur-command/pom.xml                        |  2 +-
 blur-console/pom.xml                        |  2 +-
 blur-core/pom.xml                           |  2 +-
 blur-document-security/pom.xml              |  2 +-
 blur-hive/pom.xml                           |  2 +-
 blur-kvs/pom.xml                            |  2 +-
 blur-mapred/pom.xml                         |  2 +-
 blur-query/pom.xml                          |  2 +-
 blur-shell/generate_docs.sh                 |  2 +-
 blur-shell/pom.xml                          |  2 +-
 blur-status/pom.xml                         |  2 +-
 blur-store/pom.xml                          |  2 +-
 blur-thrift/pom.xml                         |  2 +-
 blur-util/pom.xml                           |  2 +-
 contrib/blur-block-placement-policy/pom.xml |  2 +-
 contrib/blur-jdbc/pom.xml                   |  2 +-
 contrib/blur-spark/pom.xml                  |  2 +-
 contrib/blur-titan/pom.xml                  |  2 +-
 distribution/pom.xml                        |  2 +-
 docs/cluster-setup.html                     |  4 ++--
 docs/getting-started.html                   | 13 ++++++-------
 docs/using-blur.html                        | 10 +++++++---
 pom.xml                                     |  2 +-
 whiteboard/slur/pom.xml                     | 10 +++++-----
 24 files changed, 40 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-command/pom.xml
----------------------------------------------------------------------
diff --git a/blur-command/pom.xml b/blur-command/pom.xml
index f01b180..1569ca9 100644
--- a/blur-command/pom.xml
+++ b/blur-command/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-console/pom.xml
----------------------------------------------------------------------
diff --git a/blur-console/pom.xml b/blur-console/pom.xml
index 08c248a..b0017b1 100644
--- a/blur-console/pom.xml
+++ b/blur-console/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-core/pom.xml
----------------------------------------------------------------------
diff --git a/blur-core/pom.xml b/blur-core/pom.xml
index 1bcb7cc..7ff059b 100644
--- a/blur-core/pom.xml
+++ b/blur-core/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-document-security/pom.xml
----------------------------------------------------------------------
diff --git a/blur-document-security/pom.xml b/blur-document-security/pom.xml
index 16e851b..1d20750 100644
--- a/blur-document-security/pom.xml
+++ b/blur-document-security/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-hive/pom.xml
----------------------------------------------------------------------
diff --git a/blur-hive/pom.xml b/blur-hive/pom.xml
index 8d2044f..6118cde 100644
--- a/blur-hive/pom.xml
+++ b/blur-hive/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-kvs/pom.xml
----------------------------------------------------------------------
diff --git a/blur-kvs/pom.xml b/blur-kvs/pom.xml
index 7fea5b8..3034689 100644
--- a/blur-kvs/pom.xml
+++ b/blur-kvs/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-mapred/pom.xml
----------------------------------------------------------------------
diff --git a/blur-mapred/pom.xml b/blur-mapred/pom.xml
index d104b71..6962b66 100644
--- a/blur-mapred/pom.xml
+++ b/blur-mapred/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-query/pom.xml
----------------------------------------------------------------------
diff --git a/blur-query/pom.xml b/blur-query/pom.xml
index fdac571..280125f 100644
--- a/blur-query/pom.xml
+++ b/blur-query/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-shell/generate_docs.sh
----------------------------------------------------------------------
diff --git a/blur-shell/generate_docs.sh b/blur-shell/generate_docs.sh
index c5c8c41..0f72859 100755
--- a/blur-shell/generate_docs.sh
+++ b/blur-shell/generate_docs.sh
@@ -16,4 +16,4 @@
 # limitations under the License.
 
 
-mvn exec:java -Dhadoop1 -Dexec.mainClass="org.apache.blur.shell.GenerateDoc" -Dexec.args="../docs/using-blur.base.html ../docs/using-blur.html"
+mvn exec:java -Dhadoop2 -Dexec.mainClass="org.apache.blur.shell.GenerateDoc" -Dexec.args="../docs/using-blur.base.html ../docs/using-blur.html"

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-shell/pom.xml
----------------------------------------------------------------------
diff --git a/blur-shell/pom.xml b/blur-shell/pom.xml
index abc720c..01abd57 100644
--- a/blur-shell/pom.xml
+++ b/blur-shell/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-status/pom.xml
----------------------------------------------------------------------
diff --git a/blur-status/pom.xml b/blur-status/pom.xml
index 5c3fb38..dfda99e 100644
--- a/blur-status/pom.xml
+++ b/blur-status/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-store/pom.xml
----------------------------------------------------------------------
diff --git a/blur-store/pom.xml b/blur-store/pom.xml
index 84c9030..47038f1 100644
--- a/blur-store/pom.xml
+++ b/blur-store/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/blur-thrift/pom.xml b/blur-thrift/pom.xml
index 748f6c0..0ac9b17 100644
--- a/blur-thrift/pom.xml
+++ b/blur-thrift/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/blur-util/pom.xml
----------------------------------------------------------------------
diff --git a/blur-util/pom.xml b/blur-util/pom.xml
index 462f5f8..10de645 100644
--- a/blur-util/pom.xml
+++ b/blur-util/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/contrib/blur-block-placement-policy/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/blur-block-placement-policy/pom.xml b/contrib/blur-block-placement-policy/pom.xml
index ceac7fb..75ba1a5 100644
--- a/contrib/blur-block-placement-policy/pom.xml
+++ b/contrib/blur-block-placement-policy/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/contrib/blur-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/blur-jdbc/pom.xml b/contrib/blur-jdbc/pom.xml
index faca3a7..9871b45 100644
--- a/contrib/blur-jdbc/pom.xml
+++ b/contrib/blur-jdbc/pom.xml
@@ -22,7 +22,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/contrib/blur-spark/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/blur-spark/pom.xml b/contrib/blur-spark/pom.xml
index 1347c9a..e834999 100644
--- a/contrib/blur-spark/pom.xml
+++ b/contrib/blur-spark/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/contrib/blur-titan/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/blur-titan/pom.xml b/contrib/blur-titan/pom.xml
index 3d7ad9e..79f440a 100644
--- a/contrib/blur-titan/pom.xml
+++ b/contrib/blur-titan/pom.xml
@@ -23,7 +23,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 97707df..6a7aad2 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -23,7 +23,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.2.4-incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/docs/cluster-setup.html
----------------------------------------------------------------------
diff --git a/docs/cluster-setup.html b/docs/cluster-setup.html
index b2848e8..8b0241c 100644
--- a/docs/cluster-setup.html
+++ b/docs/cluster-setup.html
@@ -132,7 +132,7 @@ blur.cluster.default.table.uri=hdfs://namenode/blur/tables</code>
 			<h4>Default Properties</h4>
 			<table class="table-bordered table-striped table-condensed">
 			<tr><td>Property</td><td>Description</td></tr>
-<tr><td>blur.zookeeper.timeout (90000)</td><td>The zookeeper session timeout</td></tr><tr><td>blur.hdfs.trace.path</td><td>The path in HDFS where the distributed traces will be stored, if blank trace output will be written to the log or the ZooKeeper store.</td></tr><tr><td>blur.clientpool.client.max.connections.per.host (64)</td><td>Max number of connections per host.</td></tr><tr><td>blur.clientpool.client.stale.threshold (30)</td><td>Number of seconds between use that a connection will be marked as stale.</td></tr><tr><td>blur.clientpool.client.clean.frequency (10)</td><td>Number of seconds between checking connections.</td></tr><tr><td>blur.query.max.results.fetch (1000)</td><td>The maximum number of results that can be fetched in a single request</td></tr><tr><td>blur.query.max.row.fetch (100)</td><td>The maximum number of rows that can be fetched in a single request</td></tr><tr><td>blur.query.max.record.fetch (1000)</td><td>The maximum number of records that can be fetched in
  a single request</td></tr><tr><td>blur.metrics.reporters</td><td>Setup metric reporter</td></tr><tr><td>blur.thrift.max.frame.size (16384000)</td><td>Thrift max frame size</td></tr>
+<tr><td>blur.security.sasl.enabled (false)</td><td>Enable SASL authentication.</td></tr><tr><td>blur.security.sasl.type</td><td>The SASL authentication type.  Choices are ANONYMOUS, LDAP, CUSTOM.</td></tr><tr><td>blur.security.sasl.LDAP.domain</td><td>If SASL type is LDAP specify the ldap domain.</td></tr><tr><td>blur.security.sasl.LDAP.basedn</td><td>If SASL type is LDAP specify the ldap base dn.</td></tr><tr><td>blur.security.sasl.LDAP.url</td><td>If SASL type is LDAP specify the ldap url.</td></tr><tr><td>blur.security.sasl.CUSTOM.class</td><td>If SASL type is CUSTOM specify the custom authentication class.</td></tr><tr><td>blur.server.security.filter.class.<order></td><td>Specifies a security filter factory that allows for controlling access to method calls on the server, this is similar to database object security. Implement 'org.apache.blur.server.ServerSecurityFilterFactory' and add class name in config like 'blur.server.security.filter.class.1=mysecurity.Filter1'. NOTE: Many
  filters can be specified and they are checked in lexicographical order based on the property name.</td></tr><tr><td>blur.record.security (false)</td><td>Enables/disables record level security.</td></tr><tr><td>blur.zookeeper.timeout (90000)</td><td>The zookeeper session timeout</td></tr><tr><td>blur.hdfs.trace.path</td><td>The path in HDFS where the distributed traces will be stored, if blank trace output will be written to the log or the ZooKeeper store.</td></tr><tr><td>blur.clientpool.client.max.connections.per.host (64)</td><td>Max number of connections per host.</td></tr><tr><td>blur.clientpool.client.stale.threshold (30)</td><td>Number of seconds between use that a connection will be marked as stale.</td></tr><tr><td>blur.clientpool.client.clean.frequency (10)</td><td>Number of seconds between checking connections.</td></tr><tr><td>blur.query.max.results.fetch (1000)</td><td>The maximum number of results that can be fetched in a single request</td></tr><tr><td>blur.query.max.
 row.fetch (100)</td><td>The maximum number of rows that can be fetched in a single request</td></tr><tr><td>blur.query.max.record.fetch (1000)</td><td>The maximum number of records that can be fetched in a single request</td></tr><tr><td>blur.metrics.reporters</td><td>Setup metric reporter</td></tr><tr><td>blur.thrift.max.frame.size (16384000)</td><td>Thrift max frame size</td></tr><tr><td>blur.gc.back.pressure.heap.ratio (0.75)</td><td>The GC back pressure heap ratio, if the heap size after a GC isn't below the ratio size the GC watcher will take action to relieve pressure.</td></tr><tr><td>blur.command.lib.path</td><td>The command lib path where the controller and shard server processes will poll for new commands to enable.</td></tr><tr><td>blur.tmp.path</td><td>The command lib path where the controller and shard server processes will poll for new commands to enable.</td></tr>
 			</table>
             <h3 id="general-hadoop">Hadoop</h3>
 <p>
@@ -204,7 +204,7 @@ Swap can kill java perform, you may want to consider disabling swap.</div>
 			<h4>Default Properties</h4>
 			<table class="table-bordered table-striped table-condensed">
 			<tr><td>Property</td><td>Description</td></tr>
-<tr><td>blur.shard.hostname</td><td>The hostname for the shard, if blank the hostname is automatically detected</td></tr><tr><td>blur.shard.bind.address (0.0.0.0)</td><td>The binding address of the shard</td></tr><tr><td>blur.shard.bind.port (40020)</td><td>The default binding port of the shard server, 0 for random</td></tr><tr><td>blur.shard.command.driver.threads (16)</td><td>The number of command driver threads.</td></tr><tr><td>blur.shard.command.worker.threads (16)</td><td>The number of command worker threads.</td></tr><tr><td>blur.shard.internal.search.thread.count (16)</td><td>The number of internal lucene worker threads used to make the search call more parallel.</td></tr><tr><td>blur.shard.data.fetch.thread.count (8)</td><td>The number of fetcher threads</td></tr><tr><td>blur.shard.server.thrift.thread.count (8)</td><td>The number of the thrift threads</td></tr><tr><td>blur.shard.thrift.selector.threads (2)</td><td>The number of threads used for selector processing inside t
 he thrift server.</td></tr><tr><td>blur.shard.thrift.max.read.buffer.bytes (9223372036854775807)</td><td>The maximum number of bytes used for reading requests in the thrift server.</td></tr><tr><td>blur.shard.thrift.accept.queue.size.per.thread (4)</td><td>The size of the blocking queue per selector thread for passing accepted connections to the selector thread.</td></tr><tr><td>blur.shard.opener.thread.count (8)</td><td>The number of threads that are used for opening indexes</td></tr><tr><td>blur.shard.cache.max.querycache.elements (128)</td><td>The number of cached queries</td></tr><tr><td>blur.shard.cache.max.timetolive (60000)</td><td>The time to live for the cache query</td></tr><tr><td>blur.shard.filter.cache.class (org.apache.blur.manager.DefaultBlurFilterCache)</td><td>Default implementation of the blur cache filter, which is a pass through filter that does nothing</td></tr><tr><td>blur.shard.block.cache.version (v2)</td><td>By default the v2 version of the block cache is en
 abled</td></tr><tr><td>blur.shard.block.cache.total.size</td><td>By default the total amount of memory block cache will use is -XX:MaxDirectMemorySize - 64 MiB</td></tr><tr><td>blur.shard.blockcache.direct.memory.allocation (true)</td><td>v1 version of block cache only. By default the block cache using off heap memory</td></tr><tr><td>blur.shard.blockcache.slab.count (-1)</td><td>v1 version of block cache only. The slabs in the blockcache are automatically configured by default (-1) otherwise 1 slab equals 128MB.  The auto config is detected through the MaxDirectoryMemorySize provided to the JVM</td></tr><tr><td>blur.shard.block.cache.v2.fileBufferSize (8192)</td><td>v2 version of block cache only. File buffer size, this is the buffer size used to read and write to data to HDFS.  For production this will likely be increased.</td></tr><tr><td>blur.shard.block.cache.v2.cacheBlockSize (8192)</td><td>v2 version of block cache only. The is the size of the blocks in the off heap cache, it
  is good practice to have this match 'blur.shard.block.cache.v2.fileBufferSize'.  For production this will likely be increased.</td></tr><tr><td>blur.shard.block.cache.v2.cacheBlockSize.filter (33554432)</td><td>blur.shard.block.cache.v2.cacheBlockSize.<ext>=</td></tr><tr><td>blur.shard.block.cache.v2.store (OFF_HEAP)</td><td>v2 version of block cache only. This is used to control if the block are created on or off heap.  Values are OFF_HEAP | ON_HEAP</td></tr><tr><td>blur.shard.block.cache.v2.read.cache.ext</td><td>v2 version of block cache only. This specifies what file types should be cached during reads.  Comma delimited list.</td></tr><tr><td>blur.shard.block.cache.v2.read.nocache.ext (fdt)</td><td>v2 version of block cache only. This specifies what file types should NOT be cached during reads.  Comma delimited list.</td></tr><tr><td>blur.shard.block.cache.v2.read.default (true)</td><td>v2 version of block cache only. This specifies the default behavior if a file type is not sp
 ecified in the cache or nocache lists during reads.  Values true | false</td></tr><tr><td>blur.shard.block.cache.v2.write.cache.ext</td><td>v2 version of block cache only. This specifies what file types should be cached during writes.  Comma delimited list.</td></tr><tr><td>blur.shard.block.cache.v2.write.nocache.ext (fdt)</td><td>v2 version of block cache only. This specifies what file types should NOT be cached during writes.  Comma delimited list.</td></tr><tr><td>blur.shard.block.cache.v2.write.default (true)</td><td>v2 version of block cache only. This specifies the default behavior if a file type is not specified in the cache or nocache lists during writes.  Values true | false</td></tr><tr><td>blur.shard.index.compressionmode (FAST)</td><td>Sets the compression of used in the storing of the fields. Valid entries are FAST FAST_DECOMPRESSION HIGH_COMPRESSION</td></tr><tr><td>blur.shard.index.chunksize (16384)</td><td>Sets the chunksize of the compression in the storing of the f
 ields. Larger values may produce smaller fdt files at the small cost of fetch performance.</td></tr><tr><td>blur.shard.buffercache.8192 (67108864)</td><td>The amount of memory to be used by 8K byte buffers.  Note if you change the "blur.shard.block.cache.v2.cacheBlockSize" or "blur.shard.block.cache.v2.fileBufferSize" you should adjust the buffer sizes as well as the total memory allocated.  For example if you increased the "blur.shard.block.cache.v2.fileBufferSize" to 64K (65536) then this property should to "blur.shard.buffercache.65536".  You can also define as many of these properties as needed.</td></tr><tr><td>blur.shard.buffercache.1024 (8388608)</td><td>The amount of memory to be used by 1K byte buffers.  Note if you change the "blur.shard.block.cache.v2.cacheBlockSize" or "blur.shard.block.cache.v2.fileBufferSize" you should adjust the buffer sizes as well as the total memory allocated.</td></tr><tr><td>blur.shard.safemodedelay (5000)</td><td>The number of milliseconds to w
 ait for the cluster to settle once changes have ceased.</td></tr><tr><td>blur.shard.server.minimum.before.safemode.exit (0)</td><td>The number of shard servers in a cluster that have to be registered before the cluster will exit safemode.</td></tr><tr><td>blur.shard.time.between.commits (30000)</td><td>The default time between index commits.</td></tr><tr><td>blur.shard.time.between.refreshs (3000)</td><td>The default time between index refreshs.</td></tr><tr><td>blur.shard.merge.thread.count (8)</td><td>The max number of threads used during index merges.</td></tr><tr><td>blur.shard.small.merge.threshold (128000000)</td><td>The threshold for a small merge in bytes.</td></tr><tr><td>blur.max.clause.count (1024)</td><td>The maximum number of clauses in a BooleanQuery</td></tr><tr><td>blur.indexmanager.search.thread.count (8)</td><td>The number of thread used for parallel searching in the index manager</td></tr><tr><td>blur.indexmanager.mutate.thread.count (8)</td><td>The number of thre
 ad used for parallel mutating in the index manager</td></tr><tr><td>blur.indexmanager.facet.thread.count (8)</td><td>The number of thread used for parallel faceting in the index manager</td></tr><tr><td>blur.shard.fetchcount (110)</td><td>The fetch count per Lucene search, this fetches pointers to hits</td></tr><tr><td>blur.max.heap.per.row.fetch (10000000)</td><td>Heap limit on row fetch, once this limit has been reached the request will return</td></tr><tr><td>blur.max.records.per.row.fetch.request (1000)</td><td>The maximum number of records in a single row fetch</td></tr><tr><td>blur.gui.shard.port (40090)</td><td>The http status page port for the shard server, 0 for random</td></tr><tr><td>blur.shard.filtered.server.class</td><td>To intercept the calls made to the shard server and perform server side changes to the calls extend org.apache.blur.server.FilteredBlurServer.</td></tr><tr><td>blur.shard.blurindex.class</td><td>Defines the blur index class to be used to handle index r
 equests.  This class has to extend org.apache.blur.manager.writer.BlurIndex.  This can be defined globally as well as per table.</td></tr><tr><td>blur.shard.read.interceptor</td><td>Defines the blur read interceptor class that can mask data from query results as well as data fetches.</td></tr><tr><td>blur.lucene.fst.bytearray.factory</td><td>Defines the byte array factory class that blur will use to manage the FST trees in Lucene (extends org.apache.blur.lucene.fst.ByteArrayFactory).</td></tr><tr><td>blur.shard.queue.max.pause.time.when.empty (1000)</td><td>The maximum amount of time to pause before checking the queue for RowMutations.</td></tr><tr><td>blur.shard.queue.max.writer.lock.time (5000)</td><td>The maximum amount of time that the queue can lock the writer before committing.  NOTE: Any other writer event will cause the queue to release it's lock on the writer.</td></tr><tr><td>blur.shard.queue.max.queue.batch.size (100)</td><td>The maximum number of RowMutations the writer 
 can drain from the queue at a time.</td></tr><tr><td>blur.shard.queue.max.inmemory.length (100)</td><td>The maximum number of RowMutations that can exist in the inmemory block queue any point in time.  NOTE: This is PER SHARD.</td></tr><tr><td>blur.shard.deep.paging.cache.size (1000)</td><td>The number of deep paging cache entries kept in memory for faster deep paging.</td></tr><tr><td>blur.shard.distributed.layout.factory.class</td><td>Defines the blur layout factor class to use for managing how shards are layed out across the cluster.</td></tr>
+<tr><td>blur.bulk.update.working.path</td><td>The map reduce working path for map reduce incremental updates.</td></tr><tr><td>blur.bulk.update.working.path.permission</td><td>The desired permission on the blur.bulk.update.working.path and sub directories.  If blank the default permissions will be applied.</td></tr><tr><td>blur.shard.hostname</td><td>The hostname for the shard, if blank the hostname is automatically detected</td></tr><tr><td>blur.shard.bind.address (0.0.0.0)</td><td>The binding address of the shard</td></tr><tr><td>blur.shard.bind.port (40020)</td><td>The default binding port of the shard server, 0 for random</td></tr><tr><td>blur.shard.command.driver.threads (16)</td><td>The number of command driver threads.</td></tr><tr><td>blur.shard.command.worker.threads (16)</td><td>The number of command worker threads.</td></tr><tr><td>blur.shard.internal.search.thread.count (16)</td><td>The number of internal lucene worker threads used to make the search call more parallel.<
 /td></tr><tr><td>blur.shard.data.fetch.thread.count (8)</td><td>The number of fetcher threads</td></tr><tr><td>blur.shard.server.thrift.thread.count (8)</td><td>The number of the thrift threads</td></tr><tr><td>blur.shard.thrift.selector.threads (2)</td><td>The number of threads used for selector processing inside the thrift server.</td></tr><tr><td>blur.shard.thrift.max.read.buffer.bytes (9223372036854775807)</td><td>The maximum number of bytes used for reading requests in the thrift server.</td></tr><tr><td>blur.shard.thrift.accept.queue.size.per.thread (4)</td><td>The size of the blocking queue per selector thread for passing accepted connections to the selector thread.</td></tr><tr><td>blur.shard.opener.thread.count (8)</td><td>The number of threads that are used for opening indexes</td></tr><tr><td>blur.shard.cache.max.querycache.elements (128)</td><td>The number of cached queries</td></tr><tr><td>blur.shard.cache.max.timetolive (60000)</td><td>The time to live for the cache qu
 ery</td></tr><tr><td>blur.shard.filter.cache.class (org.apache.blur.manager.DefaultBlurFilterCache)</td><td>Default implementation of the blur cache filter, which is a pass through filter that does nothing</td></tr><tr><td>blur.table.disable.fast.dir (false)</td><td>By default the fast key value store is used with the HDFS directory.  Set to true to disable.</td></tr><tr><td>blur.shard.block.cache.version (v2)</td><td>By default the v2 version of the block cache is enabled</td></tr><tr><td>blur.shard.block.cache.total.size</td><td>By default the total amount of memory block cache will use is -XX:MaxDirectMemorySize - 64 MiB</td></tr><tr><td>blur.shard.blockcache.direct.memory.allocation (true)</td><td>v1 version of block cache only. By default the block cache using off heap memory</td></tr><tr><td>blur.shard.blockcache.slab.count (-1)</td><td>v1 version of block cache only. The slabs in the blockcache are automatically configured by default (-1) otherwise 1 slab equals 128MB.  The a
 uto config is detected through the MaxDirectoryMemorySize provided to the JVM</td></tr><tr><td>blur.shard.block.cache.v2.fileBufferSize (8192)</td><td>v2 version of block cache only. File buffer size, this is the buffer size used to read and write to data to HDFS.  For production this will likely be increased.</td></tr><tr><td>blur.shard.block.cache.v2.cacheBlockSize (8192)</td><td>v2 version of block cache only. The is the size of the blocks in the off heap cache, it is good practice to have this match 'blur.shard.block.cache.v2.fileBufferSize'.  For production this will likely be increased.</td></tr><tr><td>blur.shard.block.cache.v2.cacheBlockSize.<ext></td><td>v2 version of block cache only. Specific files type can have their own block cache sizes, such as filter files that should have a very large mapping.</td></tr><tr><td>blur.shard.block.cache.v2.directRefLimit (67108864)</td><td>v2 version of block cache only. The is the max size of file that can have a direct reference cache
  in the file handle.</td></tr><tr><td>blur.shard.block.cache.v2.directRefLimit.<ext></td><td>v2 version of block cache only. The is the max size of file that can have a direct reference cache in the file handle per file extension.</td></tr><tr><td>blur.shard.block.cache.v2.store (OFF_HEAP)</td><td>v2 version of block cache only. This is used to control if the block are created on or off heap.  Values are OFF_HEAP | ON_HEAP</td></tr><tr><td>blur.shard.block.cache.v2.read.cache.ext</td><td>v2 version of block cache only. This specifies what file types should be cached during reads.  Comma delimited list.</td></tr><tr><td>blur.shard.block.cache.v2.read.nocache.ext (fdt)</td><td>v2 version of block cache only. This specifies what file types should NOT be cached during reads.  Comma delimited list.</td></tr><tr><td>blur.shard.block.cache.v2.read.default (true)</td><td>v2 version of block cache only. This specifies the default behavior if a file type is not specified in the cache or nocac
 he lists during reads.  Values true | false</td></tr><tr><td>blur.shard.block.cache.v2.write.cache.ext</td><td>v2 version of block cache only. This specifies what file types should be cached during writes.  Comma delimited list.</td></tr><tr><td>blur.shard.block.cache.v2.write.nocache.ext (fdt)</td><td>v2 version of block cache only. This specifies what file types should NOT be cached during writes.  Comma delimited list.</td></tr><tr><td>blur.shard.block.cache.v2.write.default (true)</td><td>v2 version of block cache only. This specifies the default behavior if a file type is not specified in the cache or nocache lists during writes.  Values true | false</td></tr><tr><td>blur.shard.block.cache.v2.pool.cache.size (10000)</td><td>v2 version of block cache only. This specifies size of the cache pool for the old non-slab block cache pool.  If blur.shard.block.cache.v2.slab.enabled is true this value is ignored.</td></tr><tr><td>blur.shard.block.cache.v2.slab.enabled (true)</td><td>v2 v
 ersion of block cache only. This specifies if slab allocation is enabled for v2 block cache.  Values true | false</td></tr><tr><td>blur.shard.block.cache.v2.slab.chunk.size (8192)</td><td>v2 version of block cache only. This specifies the chunk size for the cache, this is the smallest allocation unit.</td></tr><tr><td>blur.shard.block.cache.v2.slab.size (134217728)</td><td>v2 version of block cache only. This specifies the slab size for the cache is slab are enabled.</td></tr><tr><td>blur.shard.index.compressionmode (FAST)</td><td>Sets the compression of used in the storing of the fields. Valid entries are FAST FAST_DECOMPRESSION HIGH_COMPRESSION</td></tr><tr><td>blur.shard.index.chunksize (16384)</td><td>Sets the chunksize of the compression in the storing of the fields. Larger values may produce smaller fdt files at the small cost of fetch performance.</td></tr><tr><td>blur.shard.buffercache.8192 (67108864)</td><td>The amount of memory to be used by 8K byte buffers.  Note if you c
 hange the "blur.shard.block.cache.v2.cacheBlockSize" or "blur.shard.block.cache.v2.fileBufferSize" you should adjust the buffer sizes as well as the total memory allocated.  For example if you increased the "blur.shard.block.cache.v2.fileBufferSize" to 64K (65536) then this property should to "blur.shard.buffercache.65536".  You can also define as many of these properties as needed.</td></tr><tr><td>blur.shard.buffercache.1024 (8388608)</td><td>The amount of memory to be used by 1K byte buffers.  Note if you change the "blur.shard.block.cache.v2.cacheBlockSize" or "blur.shard.block.cache.v2.fileBufferSize" you should adjust the buffer sizes as well as the total memory allocated.</td></tr><tr><td>blur.shard.safemodedelay (5000)</td><td>The number of milliseconds to wait for the cluster to settle once changes have ceased.</td></tr><tr><td>blur.shard.server.minimum.before.safemode.exit (0)</td><td>The number of shard servers in a cluster that have to be registered before the cluster wi
 ll exit safemode.</td></tr><tr><td>blur.shard.time.between.commits (30000)</td><td>The default time between index commits.</td></tr><tr><td>blur.shard.time.between.refreshs (3000)</td><td>The default time between index refreshs.</td></tr><tr><td>blur.shard.merge.thread.count (8)</td><td>The max number of threads used during index merges.</td></tr><tr><td>blur.shard.small.merge.threshold (128000000)</td><td>The threshold for a small merge in bytes.</td></tr><tr><td>blur.shard.index.writer.sort.memory (10485760)</td><td>The amount of memory used to sort bulk indexing.</td></tr><tr><td>blur.shard.index.writer.sort.factor (10000)</td><td>The merge factor sort bulk indexing.</td></tr><tr><td>blur.max.clause.count (1024)</td><td>The maximum number of clauses in a BooleanQuery</td></tr><tr><td>blur.indexmanager.search.thread.count (8)</td><td>The number of thread used for parallel searching in the index manager</td></tr><tr><td>blur.indexmanager.mutate.thread.count (8)</td><td>The number o
 f thread used for parallel mutating in the index manager</td></tr><tr><td>blur.indexmanager.facet.thread.count (8)</td><td>The number of thread used for parallel faceting in the index manager</td></tr><tr><td>blur.shard.default.read.sequential.threshold (25)</td><td>The number of reads during normal read operations of a index input in sequence that will trigger a sequential read switch.</td></tr><tr><td>blur.shard.default.read.sequential.skip.threshold (32768)</td><td>The number of bytes during normal read operations where sequential read of an input stream will skip instead of seeking and breaking the sequential read.</td></tr><tr><td>blur.shard.merge.read.sequential.threshold (5)</td><td>The number of reads during a merge of a index input in sequence that will trigger a sequential read switch.</td></tr><tr><td>blur.shard.merge.read.sequential.skip.threshold (131072)</td><td>The number of bytes during a merge where sequential read of an input stream will skip instead of seeking and
  breaking the sequential read.</td></tr><tr><td>blur.shard.index.deletion.policy.maxage (org.apache.lucene.index.KeepOnlyLastCommitDeletionPolicy)</td><td>The default index deletion policy class that manages removing old segments that are no longer referenced.</td></tr><tr><td>blur.shard.index.similarity (org.apache.blur.lucene.search.FairSimilarity)</td><td>The default index similarity object used for both indexing and searching.</td></tr><tr><td>blur.shard.fetchcount (250)</td><td>The fetch count per Lucene search, this fetches pointers to hits</td></tr><tr><td>blur.max.heap.per.row.fetch (10000000)</td><td>Heap limit on row fetch, once this limit has been reached the request will return</td></tr><tr><td>blur.max.records.per.row.fetch.request (1000)</td><td>The maximum number of records in a single row fetch</td></tr><tr><td>blur.gui.shard.port (40090)</td><td>The http status page port for the shard server, 0 for random</td></tr><tr><td>blur.shard.filtered.server.class</td><td>To 
 intercept the calls made to the shard server and perform server side changes to the calls extend org.apache.blur.server.FilteredBlurServer.</td></tr><tr><td>blur.shard.blurindex.class (org.apache.blur.manager.writer.BlurIndexSimpleWriter)</td><td>Defines the blur index class to be used to handle index requests.  This class has to extend org.apache.blur.manager.writer.BlurIndex.  This can be defined globally as well as per table.</td></tr><tr><td>blur.shard.read.interceptor</td><td>Defines the blur read interceptor class that can mask data from query results as well as data fetches.</td></tr><tr><td>blur.lucene.fst.bytearray.factory (org.apache.blur.lucene.fst.ByteArrayPrimitiveFactory)</td><td>Defines the byte array factory class that blur will use to manage the FST trees in Lucene (extends org.apache.blur.lucene.fst.ByteArrayFactory).</td></tr><tr><td>blur.shard.queue.max.pause.time.when.empty (1000)</td><td>The maximum amount of time to pause before checking the queue for RowMutat
 ions.</td></tr><tr><td>blur.shard.queue.max.writer.lock.time (5000)</td><td>The maximum amount of time that the queue can lock the writer before committing.  NOTE: Any other writer event will cause the queue to release it's lock on the writer.</td></tr><tr><td>blur.shard.queue.max.queue.batch.size (100)</td><td>The maximum number of RowMutations the writer can drain from the queue at a time.</td></tr><tr><td>blur.shard.queue.max.inmemory.length (100)</td><td>The maximum number of RowMutations that can exist in the inmemory block queue any point in time.  NOTE: This is PER SHARD.</td></tr><tr><td>blur.shard.deep.paging.cache.size (1000)</td><td>The number of deep paging cache entries kept in memory for faster deep paging.</td></tr><tr><td>blur.shard.distributed.layout.factory.class</td><td>Defines the blur layout factor class to use for managing how shards are layed out across the cluster.</td></tr><tr><td>blur.shard.request.cache.size (10000000)</td><td>Sets the request cache size i
 n bytes.</td></tr>
 			</table>
 
             <h3 id="shard-blur-env">blur-env.sh</h3>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/docs/getting-started.html
----------------------------------------------------------------------
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 7d8f1ea..aef2264 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -99,9 +99,8 @@ cat ~/.ssh/id_dsa.pub >> ~/.ssh/authorized_keys</code></pre>
             <h3>Download Source and Binary Artifacts</h3>
             <p>
 	Both the source and binary artifacts are provided via mirrors here:<br/><br/>
-              <a href="http://www.apache.org/dyn/closer.cgi/incubator/blur/0.2.4-incubating-SNAPSHOT/apache-blur-0.2.4-incubating-src.tar.gz" class="btn btn-large btn-primary">Apache Blur 0.2.4 Source</a>
-              <a href="http://www.apache.org/dyn/closer.cgi/incubator/blur/0.2.4-incubating-SNAPSHOT/apache-blur-0.2.4-incubating-hadoop1-bin.tar.gz" class="btn btn-large btn-primary">Apache Blur 0.2.4 Hadoop1 Binary</a>
-              <a href="http://www.apache.org/dyn/closer.cgi/incubator/blur/0.2.4-incubating-SNAPSHOT/apache-blur-0.2.4-incubating-hadoop2-bin.tar.gz" class="btn btn-large btn-primary">Apache Blur 0.2.4 Hadoop2 Binary</a>
+              <a href="http://www.apache.org/dyn/closer.cgi/incubator/blur/0.2.4-incubating/apache-blur-0.2.4-incubating-src.tar.gz" class="btn btn-large btn-primary">Apache Blur 0.2.4 Source</a>
+              <a href="http://www.apache.org/dyn/closer.cgi/incubator/blur/0.2.4-incubating/apache-blur-hadoop2-2.6.0-0.2.4-incubating-bin.tar.gz" class="btn btn-large btn-primary">Apache Blur 0.2.4 Hadoop2 Binary</a>
             </p>
           </section>
           <section>
@@ -117,13 +116,13 @@ cat ~/.ssh/id_dsa.pub >> ~/.ssh/authorized_keys</code></pre>
             <p>Build the artifacts for Hadoop 1 (if you want to run the tests remove the "-DskipTests")</p>
             <pre><code class="bash">cd incubator-blur/
 mvn install -DskipTests -Dhadoop1</code></pre>
-            <p>The binary artifact is located <code>distribution/target/apache-blur-0.2.4-incubating-SNAPSHOT-hadoop1-bin.tar.gz</code>.</p>
+            <p>The binary artifact is located <code>distribution/target/apache-blur-hadoop1-1.2.1-0.2.4-incubating-bin.tar.gz</code>.</p>
             <h4>Hadoop 2</h4>
             <div class="bs-callout bs-callout-info"><h4>Heads Up!</h4><p>While all the tests pass on Hadoop 2, Blur has not be tested at scale on Hadoop 2 and bin/blur-config.sh script will likely require modification to include the correct Hadoop 2 libraries.</p></div>
             <p>Build the artifacts for Hadoop 2 (if you want to run the tests remove the "-DskipTests")</p>
 			<pre><code class="bash">cd incubator-blur/
 mvn install -DskipTests -Dhadoop2</code></pre>
-			<p>The binary artifact is located <code>distribution/target/apache-blur-0.2.4-incubating-SNAPSHOT-hadoop2-bin.tar.gz</code>.</p>
+			<p>The binary artifact is located <code>distribution/target/apache-blur-hadoop2-2.6.0-0.2.4-incubating-bin.tar.gz</code>.</p>
           </section>
           <section>
             <div class="page-header">
@@ -164,12 +163,12 @@ mvn install -DskipTests -Dhadoop2</code></pre>
             <p>
               You should see:
             </p>
-            <pre><code class="bash">blur@blurvm:~$ apache-blur-0.2.4-incubating-SNAPSHOT/bin/start-all.sh
+            <pre><code class="bash">blur@blurvm:~$ apache-blur-0.2.4-incubating/bin/start-all.sh
 localhost: ZooKeeper starting as process 6650.
 localhost: Shard [0] starting as process 6783.
 localhost: Controller [0] starting as process 6933.</code></pre>
             <p>If you run the start command again you should see:</p>
-            <pre><code class="bash">blur@blurvm:~$ apache-blur-0.2.4-incubating-SNAPSHOT/bin/stop-all.sh
+            <pre><code class="bash">blur@blurvm:~$ apache-blur-0.2.4-incubating/bin/stop-all.sh
 localhost: Stopping Controller [0] server with pid [6933].
 localhost: Stopping Shard [0] server with pid [6783].
 localhost: Stopping ZooKeeper with pid [6650].</code></pre>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/docs/using-blur.html
----------------------------------------------------------------------
diff --git a/docs/using-blur.html b/docs/using-blur.html
index 6071d19..058a84c 100644
--- a/docs/using-blur.html
+++ b/docs/using-blur.html
@@ -101,6 +101,7 @@
 <li><a href="#shell_command_create-snapshot">&nbsp;&nbsp;create-snapshot</a></li>
 <li><a href="#shell_command_remove-snapshot">&nbsp;&nbsp;remove-snapshot</a></li>
 <li><a href="#shell_command_list-snapshots">&nbsp;&nbsp;list-snapshots</a></li>
+<li><a href="#shell_command_import">&nbsp;&nbsp;import</a></li>
 </ul></li>
 <li><a href="#shell_cluster_commands">Cluster Commands</a>
 <ul class="nav">
@@ -455,8 +456,8 @@ The following rules are used when interacting with the shell:
 <p>Description: Parse a query and return string representation.<br/>
 <pre><code class="bash">parse &lt;tablename&gt; &lt;query&gt;</code></pre></p>
 <h4 id="shell_command_definecolumn">definecolumn</h4>
-<p>Description: Defines a new column in the named table. '-F' option is for fieldless searching and the '-S' is for sortability.<br/>
-<pre><code class="bash">definecolumn &lt;table name&gt; &lt;family&gt; &lt;column name&gt; &lt;type&gt; [-s &lt;sub column name&gt;] [-F] [-S] [-p name value]*</code></pre></p>
+<p>Description: Defines a new column in the named table. '-F' option is for fieldless searching, the '-S' is for sortability and '-M' is for allowing multiple values per column.<br/>
+<pre><code class="bash">definecolumn &lt;table name&gt; &lt;family&gt; &lt;column name&gt; &lt;type&gt; [-s &lt;sub column name&gt;] [-F] [-S] [-M] [-p name value]*</code></pre></p>
 <h4 id="shell_command_optimize">optimize</h4>
 <p>Description: Optimize the named table.<br/>
 <pre><code class="bash">optimize &lt;tablename&gt; &lt;number of segments per shard&gt;</code></pre></p>
@@ -466,7 +467,7 @@ The following rules are used when interacting with the shell:
 <h3 id="shell_data_commands">Data Commands</h3>
 <h4 id="shell_command_query">query</h4>
 <p>Description: Query the named table.  Run -h for full argument list.<br/>
-<pre><code class="bash">query &lt;tablename&gt; &lt;query&gt; [&lt;options&gt;]</code></pre></p>
+<pre><code class="bash">query &lt;tablename&gt; [&lt;options&gt;]</code></pre></p>
 <h4 id="shell_command_get">get</h4>
 <p>Description: display the specified row<br/>
 <pre><code class="bash">get &lt;tablename&gt; &lt;rowid&gt;</code></pre></p>
@@ -494,6 +495,9 @@ The following rules are used when interacting with the shell:
 <h4 id="shell_command_list-snapshots">list-snapshots</h4>
 <p>Description: List the existing snapshots of a table<br/>
 <pre><code class="bash">list-snapshots &lt;tablename&gt;</code></pre></p>
+<h4 id="shell_command_import">import</h4>
+<p>Description: Import data from external location.<br/>
+<pre><code class="bash">import &lt;table&gt; &lt;path location&gt;</code></pre></p>
 <h3 id="shell_cluster_commands">Cluster Commands</h3>
 <h4 id="shell_command_controllers">controllers</h4>
 <p>Description: List controllers.<br/>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 23e2479..18642d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
 
 	<groupId>org.apache.blur</groupId>
 	<artifactId>blur</artifactId>
-	<version>0.2.4-incubating-SNAPSHOT</version>
+	<version>0.2.4-incubating</version>
 	<packaging>pom</packaging>
 
 	<name>Blur</name>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e9156d50/whiteboard/slur/pom.xml
----------------------------------------------------------------------
diff --git a/whiteboard/slur/pom.xml b/whiteboard/slur/pom.xml
index ac598f8..c9aa5b7 100644
--- a/whiteboard/slur/pom.xml
+++ b/whiteboard/slur/pom.xml
@@ -34,18 +34,18 @@ under the License.
 		<dependency>
 			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-core</artifactId>
-			<version>0.2.4-incubating-SNAPSHOT</version>
+			<version>0.2.4-incubating</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-util</artifactId>
-			<version>0.2.4-incubating-SNAPSHOT</version>
+			<version>0.2.4-incubating</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-thrift</artifactId>
-			<version>0.2.4-incubating-SNAPSHOT</version>
+			<version>0.2.4-incubating</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -60,14 +60,14 @@ under the License.
 		<dependency>
 			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-core</artifactId>
-			<version>0.2.4-incubating-SNAPSHOT</version>
+			<version>0.2.4-incubating</version>
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-util</artifactId>
-			<version>0.2.4-incubating-SNAPSHOT</version>
+			<version>0.2.4-incubating</version>
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>


Mime
View raw message