You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/09/05 23:17:19 UTC
[03/18] git commit: ACCUMULO-1957 updated with [~elserj]s review
ACCUMULO-1957 updated with [~elserj]s review
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7d608509
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d608509
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d608509
Branch: refs/heads/master
Commit: 7d608509e2f79c5f9d6093efb72aca71a32921bd
Parents: a25796c
Author: Eric C. Newton <er...@gmail.com>
Authored: Wed Aug 27 17:07:13 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Sep 5 17:16:58 2014 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/conf/Property.java | 1 +
core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7d608509/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 018e83f..6ac6fa9 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -392,6 +392,7 @@ public enum Property {
TABLE_BLOOM_HASHTYPE("table.bloom.hash.type", "murmur", PropertyType.STRING, "The bloom filter hash type"),
TABLE_DURABILITY("table.durability", "sync", PropertyType.DURABILITY, "The durability used to write to the write-ahead log." +
" Legal values are: none, which skips the write-ahead log; " +
+ "log, which sends the data to the write-ahead log, but does nothing to make it durable; " +
"flush, which pushes data to the file system; and " +
"sync, which ensures the data is written to disk."),
TABLE_FAILURES_IGNORE("table.failures.ignore", "false", PropertyType.BOOLEAN,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7d608509/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index 00202cf..fc20535 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@ -68,7 +68,7 @@ public enum PropertyType {
CLASSNAME("java class", "[\\w$.]*", "A fully qualified java class name representing a class on the classpath.\n"
+ "An example is 'java.lang.String', rather than 'String'"),
- DURABILITY("durability", "(?:none|log|flush|sync)", "One of 'none', 'flush' or 'sync'."),
+ DURABILITY("durability", "(?:none|log|flush|sync)", "One of 'none', 'log', 'flush' or 'sync'."),
STRING("string", ".*",
"An arbitrary string of characters whose format is unspecified and interpreted based on the context of the property to which it applies."), BOOLEAN(