incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject git commit: Forgot to add the new property to the properties file.
Date Wed, 27 May 2015 13:23:42 GMT
Repository: incubator-blur
Updated Branches:
  refs/heads/master ff9022bcf -> 582eaa854


Forgot to add the new property to the properties file.


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

Branch: refs/heads/master
Commit: 582eaa854f87840315b63c7b058e6dcd7d2078cd
Parents: ff9022b
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Wed May 27 09:24:14 2015 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Wed May 27 09:24:14 2015 -0400

----------------------------------------------------------------------
 blur-util/src/main/resources/blur-default.properties           | 2 ++
 .../src/test/java/org/apache/blur/utils/BlurConstantsTest.java | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/582eaa85/blur-util/src/main/resources/blur-default.properties
----------------------------------------------------------------------
diff --git a/blur-util/src/main/resources/blur-default.properties b/blur-util/src/main/resources/blur-default.properties
index 8f5f620..1682688 100644
--- a/blur-util/src/main/resources/blur-default.properties
+++ b/blur-util/src/main/resources/blur-default.properties
@@ -77,6 +77,8 @@ blur.command.lib.path=
 blur.tmp.path=
 
 ### Shard Server Configuration
+# The map reduce working path for map reduce incremental updates.
+blur.bulk.update.working.path=
 
 # The hostname for the shard, if blank the hostname is automatically detected
 blur.shard.hostname=

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/582eaa85/blur-util/src/test/java/org/apache/blur/utils/BlurConstantsTest.java
----------------------------------------------------------------------
diff --git a/blur-util/src/test/java/org/apache/blur/utils/BlurConstantsTest.java b/blur-util/src/test/java/org/apache/blur/utils/BlurConstantsTest.java
index 04a1a34..e54f895 100644
--- a/blur-util/src/test/java/org/apache/blur/utils/BlurConstantsTest.java
+++ b/blur-util/src/test/java/org/apache/blur/utils/BlurConstantsTest.java
@@ -42,7 +42,8 @@ public class BlurConstantsTest {
         "ROW_ID", "RECORD_ID", "FIELDS", "FAMILY", "DEFAULT_FAMILY", "SUPER", "SEP", "BLUR_HOME",
         "DELETE_MARKER_VALUE", "DELETE_MARKER", "BLUR_ZOOKEEPER_TIMEOUT_DEFAULT", "BLUR_THRIFT_DEFAULT_MAX_FRAME_SIZE",
         "ZK_WAIT_TIME", "ACL_DISCOVER", "ACL_READ", "FAST_DECOMPRESSION", "FAST", "HIGH_COMPRESSION",
"DEFAULT_VALUE",
-        "OFF_HEAP", "DEFAULT", "BLUR_CLUSTER", "BLUR_NODENAME", "BLUR_HTTP_STATUS_RUNNING_PORT",
"SHARED_MERGE_SCHEDULER_PREFIX"));
+        "OFF_HEAP", "DEFAULT", "BLUR_CLUSTER", "BLUR_NODENAME", "BLUR_HTTP_STATUS_RUNNING_PORT",
+        "SHARED_MERGE_SCHEDULER_PREFIX"));
     _emptyDefaultProperties = new HashSet<String>();
     _emptyDefaultProperties.addAll(Arrays.asList("BLUR_HDFS_TRACE_PATH", "BLUR_SHARD_HOSTNAME",
         "BLUR_SHARD_BLOCK_CACHE_TOTAL_SIZE", "BLUR_CONTROLLER_HOSTNAME", "BLUR_SHARD_READ_INTERCEPTOR",
@@ -50,7 +51,8 @@ public class BlurConstantsTest {
         "BLUR_SHARD_BLOCK_CACHE_V2_CACHE_BLOCK_SIZE_PREFIX", "BLUR_FIELDTYPE", "BLUR_SHARD_FILTERED_SERVER_CLASS",
         "BLUR_CONTROLLER_FILTERED_SERVER_CLASS", "BLUR_COMMAND_LIB_PATH", "BLUR_TMP_PATH",
"BLUR_SECURITY_SASL_TYPE",
         "BLUR_SECUTIRY_SASL_CUSTOM_CLASS", "BLUR_SECURITY_SASL_LDAP_DOMAIN", "BLUR_SECURITY_SASL_LDAP_BASEDN",
-        "BLUR_SECURITY_SASL_LDAP_URL", "BLUR_SERVER_SECURITY_FILTER_CLASS", "BLUR_FILTER_ALIAS"));
+        "BLUR_SECURITY_SASL_LDAP_URL", "BLUR_SERVER_SECURITY_FILTER_CLASS", "BLUR_FILTER_ALIAS",
+        "BLUR_BULK_UPDATE_WORKING_PATH"));
   }
 
   @Test


Mime
View raw message