You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/10/11 00:41:50 UTC
[08/21] git commit: Merge branch '1.5' into 1.6
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2dab1295
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2dab1295
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2dab1295
Branch: refs/heads/master
Commit: 2dab1295a5bfee6e8262014c6889a2de5541b284
Parents: a269f75 633e4df
Author: Josh Elser <el...@apache.org>
Authored: Fri Oct 10 17:33:16 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Oct 10 17:33:16 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/security/Authorizations.java | 1 -
.../apache/accumulo/core/util/shell/commands/ConfigCommand.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2dab1295/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2dab1295/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
index c76a51f,9e9536c..9567a47
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
@@@ -220,23 -184,14 +220,23 @@@ public class ConfigCommand extends Comm
printed = true;
}
if (!siteConfig.containsKey(key) || !siteVal.equals(sysVal)) {
- printConfLine(output, "system", printed ? " @override" : key, sysVal == null ? "" : sysVal);
+ printConfLine(output, "system", printed ? " @override" : key, sysVal);
printed = true;
}
+
+ }
+ if (nspVal != null) {
+ if (!systemConfig.containsKey(key) || !sysVal.equals(nspVal)) {
+ printConfLine(output, "namespace", printed ? " @override" : key, nspVal == null ? "" : nspVal);
+ printed = true;
+ }
}
-
+
// show per-table value only if it is different (overridden)
- if (tableName != null && !curVal.equals(sysVal)) {
+ if (tableName != null && !curVal.equals(nspVal)) {
printConfLine(output, "table", printed ? " @override" : key, curVal);
+ } else if (namespace != null && !curVal.equals(sysVal)) {
+ printConfLine(output, "namespace", printed ? " @override" : key, curVal);
}
}
printConfFooter(output);