accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhava...@apache.org
Subject [3/4] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Mon, 14 Jul 2014 18:30:46 GMT
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
	server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java


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

Branch: refs/heads/master
Commit: a626d5726e5c206cf98591c389df770b24830ed4
Parents: 10a1006 d53d45c
Author: Bill Havanki <bhavanki@cloudera.com>
Authored: Mon Jul 14 14:25:58 2014 -0400
Committer: Bill Havanki <bhavanki@cloudera.com>
Committed: Mon Jul 14 14:25:58 2014 -0400

----------------------------------------------------------------------
 .../server/conf/NamespaceConfWatcher.java       |  40 ++--
 .../server/conf/NamespaceConfiguration.java     | 104 +++++-----
 .../server/conf/ServerConfiguration.java        |  79 ++------
 .../server/conf/ServerConfigurationFactory.java | 194 +++++++++++++++++++
 .../accumulo/server/conf/TableConfWatcher.java  |  42 ++--
 .../server/conf/TableConfiguration.java         |  90 ++++-----
 .../server/conf/TableParentConfiguration.java   |  10 +
 .../server/conf/ZooCachePropertyAccessor.java   | 150 ++++++++++++++
 .../accumulo/server/conf/ZooConfiguration.java  |  47 ++---
 .../server/conf/ZooConfigurationFactory.java    | 107 ++++++++++
 .../server/conf/NamespaceConfigurationTest.java | 159 +++++++++++++++
 .../conf/ServerConfigurationFactoryTest.java    | 159 +++++++++++++++
 .../server/conf/TableConfigurationTest.java     | 129 ++++++++++--
 .../conf/ZooCachePropertyAccessorTest.java      | 188 ++++++++++++++++++
 .../conf/ZooConfigurationFactoryTest.java       |  66 +++++++
 15 files changed, 1323 insertions(+), 241 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a626d572/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a626d572/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a626d572/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
----------------------------------------------------------------------


Mime
View raw message