Updated Branches: refs/heads/flume-1.4 1f4d1400e -> 835f98f6b
FLUME-1822. Update javadoc for FlumeConfiguration. (Hari Shreedharan via Mike Percy) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/835f98f6 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/835f98f6 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/835f98f6 Branch: refs/heads/flume-1.4 Commit: 835f98f6b681e1b83593d36280e3207c750fb7b7 Parents: 1f4d140 Author: Mike Percy <[email protected]> Authored: Thu Mar 14 18:25:38 2013 -0700 Committer: Mike Percy <[email protected]> Committed: Thu Mar 14 18:26:06 2013 -0700 ---------------------------------------------------------------------- .../org/apache/flume/conf/FlumeConfiguration.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/835f98f6/flume-ng-configuration/src/main/java/org/apache/flume/conf/FlumeConfiguration.java ---------------------------------------------------------------------- diff --git a/flume-ng-configuration/src/main/java/org/apache/flume/conf/FlumeConfiguration.java b/flume-ng-configuration/src/main/java/org/apache/flume/conf/FlumeConfiguration.java index 1662e56..f214149 100644 --- a/flume-ng-configuration/src/main/java/org/apache/flume/conf/FlumeConfiguration.java +++ b/flume-ng-configuration/src/main/java/org/apache/flume/conf/FlumeConfiguration.java @@ -45,14 +45,14 @@ import org.slf4j.LoggerFactory; /** * <p> * FlumeConfiguration is an in memory representation of the hierarchical - * configuration namespace required by the PropertiesFileConfigurationProvider. - * This class is instantiated with a properties object which is parsed to - * construct the hierarchy in memory. Once the entire set of properties have + * configuration namespace required by the ConfigurationProvider. + * This class is instantiated with a map or properties object which is parsed + * to construct the hierarchy in memory. Once the entire set of properties have * been parsed and populated, a validation routine is run that identifies and * removes invalid components. * </p> * - * @see org.apache.flume.conf.properties.PropertiesFileConfigurationProvider + * @see org.apache.flume.node.ConfigurationProvider * */ public class FlumeConfiguration {
