incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1487638 [2/8] - in /incubator/ambari/branches/branch-1.4.0: ./ ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/ ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/ ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/ ...
Date Wed, 29 May 2013 20:46:34 GMT
Added: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/mapred2/service_check.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/mapred2/service_check.pp?rev=1487638&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/mapred2/service_check.pp
(added)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/mapred2/service_check.pp
Wed May 29 20:46:31 2013
@@ -0,0 +1,69 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+class hdp-yarn::mapred2::service_check()
+{
+  $smoke_test_user = $hdp::params::smokeuser
+
+  $jar_location = $hdp::params::hadoop_mapred2_jar_location
+  $input_file = "/user/${smoke_test_user}/mapredsmokeinput"
+  $output_file = "/user/${smoke_test_user}/mapredsmokeoutput"
+  $hadoop_conf_dir = $hdp::params::hadoop_conf_dir
+
+  $cleanup_cmd = "fs -rm -r -f ${output_file} ${input_file}"
+  $create_file_cmd = "fs -put /etc/passwd ${input_file}"
+  $test_cmd = "fs -test -e ${output_file}"
+  $run_wordcount_job = "jar ${jar_location}/hadoop-mapreduce-examples-2.0.3.22-alpha.jar
wordcount ${input_file} ${output_file}"
+
+  anchor { 'hdp-yarn::mapred2::service_check::begin':}
+
+  hdp-hadoop::exec-hadoop { 'mapred::service_check::cleanup_before':
+    command   => $cleanup_cmd,
+    tries     => 1,
+    try_sleep => 5,
+    user      => $smoke_test_user
+  }
+
+  hdp-hadoop::exec-hadoop { 'mapred::service_check::create_file':
+    command   => $create_file_cmd,
+    tries     => 1,
+    try_sleep => 5,
+    user      => $smoke_test_user
+  }
+
+  hdp-hadoop::exec-hadoop { 'mapred::service_check::run_wordcount':
+    command   => $run_wordcount_job,
+    tries     => 1,
+    try_sleep => 5,
+    user      => $smoke_test_user,
+    logoutput => "true"
+  }
+
+  hdp-hadoop::exec-hadoop { 'mapred::service_check::test':
+    command     => $test_cmd,
+    refreshonly => true,
+    user        => $smoke_test_user
+  }
+
+  anchor { 'hdp-yarn::mapred2::service_check::end':}
+
+  Anchor['hdp-yarn::mapred2::service_check::begin'] -> Hdp-hadoop::Exec-hadoop['mapred::service_check::cleanup_before']
-> Hdp-hadoop::Exec-hadoop['mapred::service_check::create_file'] -> Hdp-hadoop::Exec-hadoop['mapred::service_check::run_wordcount']
-> Hdp-hadoop::Exec-hadoop['mapred::service_check::test'] -> Anchor['hdp-yarn::mapred2::service_check::end']
+
+}

Modified: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp
Wed May 29 20:46:31 2013
@@ -24,7 +24,9 @@ class hdp-yarn::nodemanager(
 ) inherits hdp-yarn::params
 {
   $yarn_user = $hdp-yarn::params::yarn_user
-  
+  $nm_local_dirs = $hdp-yarn::params::nm_local_dirs
+  $nm_log_dirs = $hdp-yarn::params::nm_log_dirs
+
   if ($service_state == 'no_op') {
   } elsif ($service_state in 'installed_and_configured') {
   
@@ -36,12 +38,28 @@ class hdp-yarn::nodemanager(
   } elsif ($service_state in ['running','stopped']) {
 
     include hdp-yarn::initialize
- 
+
+    hdp::directory_recursive_create { $nm_local_dirs: 
+      owner       => $yarn_user,
+      context_tag => 'yarn_service',
+      service_state => $service_state,
+      force => true
+    }
+
+    hdp::directory_recursive_create { $nm_log_dirs: 
+      owner       => $yarn_user,
+      context_tag => 'yarn_service',
+      service_state => $service_state,
+      force => true
+    }
+
     hdp-yarn::service{ 'nodemanager':
       ensure       => $service_state,
       user         => $yarn_user
     }
 
+    anchor{"hdp-yarn::nodemanager::begin":} -> Hdp::Directory_recursive_create[$nm_local_dirs]
-> Hdp-yarn::Service['nodemanager'] -> anchor{"hdp-yarn::nodemanager::end":}
+
   } else {
     hdp_fail("TODO not implemented yet: service_state = ${service_state}")
   }

Modified: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
Wed May 29 20:46:31 2013
@@ -29,15 +29,17 @@ class hdp-yarn::params(
   
   $hadoop_common_home = hdp_default("yarn/yarn-env/hadoop_common_home","/usr/lib/hadoop")
   $hadoop_hdfs_home = hdp_default("yarn/yarn-env/hadoop_hdfs_home","/usr/lib/hadoop-hdfs")
-  $hadoop_mapred_home = hdp_default("yarn/yarn-env/hadoop_mapred_home","/usr/lib/hadoop-yarn")
+  $hadoop_mapred_home = hdp_default("yarn/yarn-env/hadoop_mapred_home","/usr/lib/hadoop-mapreduce")
   $hadoop_yarn_home = hdp_default("yarn/yarn-env/hadoop_yarn_home","/usr/lib/hadoop-yarn")
   
   $yarn_log_dir_prefix = hdp_default("hadoop/yarn-env/yarn_log_dir_prefix","/var/log/hadoop-yarn")
   $yarn_pid_dir_prefix = hdp_default("hadoop/yarn-env/yarn_pid_dir_prefix","/var/run/hadoop-yarn")
   
   ## yarn-site
-  $rm_webui_port = hdp_default("yarn-site/yarn.resourcemanager.webapp.address", "8088")
-  $nm_webui_port = hdp_default("yarn-site/yarn.nodemanager.webapp.address", "8042")
-  $hs_webui_port = hdp_default("yarn-site/mapreduce.jobhistory.address", "19888")
-
+  $rm_webui_address = hdp_default("yarn-site/yarn.resourcemanager.webapp.address", "localhost:8088")
+  $nm_webui_address = hdp_default("yarn-site/yarn.nodemanager.webapp.address", "localhost:8042")
+  $hs_webui_address = hdp_default("mapred-site/mapreduce.jobhistory.webapp.address", "localhost:19888")
+  
+  $nm_local_dirs = hdp_default("yarn-site/yarn.nodemanager.local-dirs", "$hadoop_tmp_dir/nm-local-dir")
+  $nm_log_dirs = hdp_default("yarn-site/yarn.nodemanager.log-dirs", "/var/log/hadoop-yarn/yarn")
 }

Modified: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
Wed May 29 20:46:31 2013
@@ -98,8 +98,7 @@ define hdp-yarn::service(
   anchor{"hdp-yarn::service::${name}::begin":}
   anchor{"hdp-yarn::service::${name}::end":}
   if ($daemon_cmd != undef) {
-    Anchor["hdp-yarn::service::${name}::begin"] -> Hdp::Directory_recursive_create<|context_tag
== 'yarn_service'|> ->
-      Hdp::Exec[$daemon_cmd] -> Anchor["hdp-yarn::service::${name}::end"]
+    Anchor["hdp-yarn::service::${name}::begin"] -> Hdp::Directory_recursive_create<|title
== $pid_dir or title == $log_dir|> -> Hdp::Exec[$daemon_cmd] -> Anchor["hdp-yarn::service::${name}::end"]
 
   }
   if ($ensure == 'running') {

Modified: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/smoketest.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/smoketest.pp?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/smoketest.pp
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/smoketest.pp
Wed May 29 20:46:31 2013
@@ -22,16 +22,16 @@ class hdp-yarn::smoketest(
   $component_name = undef
 )
 {
-  $rm_webui_port = $hdp-yarn::params::rm_webui_port
-  $nm_webui_port = $hdp-yarn::params::nm_webui_port
-  $hs_webui_port = $hdp-yarn::params::hs_webui_port
+  $rm_webui_address = $hdp-yarn::params::rm_webui_address
+  $nm_webui_address = $hdp-yarn::params::nm_webui_address
+  $hs_webui_address = $hdp-yarn::params::hs_webui_address
 
   if ($component_name == 'resourcemanager') {
     $component_type = 'rm'
-    $component_port = $rm_webui_port
+    $component_address = $rm_webui_address
   } elsif ($component_name == 'historyserver') {
     $component_type = 'hs' 
-    $component_port = $hs_webui_port
+    $component_address = $hs_webui_address
   } else {
     hdp_fail("Unsupported component name: $component_name")
   }
@@ -41,7 +41,7 @@ class hdp-yarn::smoketest(
   $validateStatusFileName = "validateYarnComponentStatus.py"
   $validateStatusFilePath = "/tmp/$validateStatusFileName"
 
-  $validateStatusCmd = "su - ${smoke_test_user} -c 'python $validateStatusFilePath $component_type
-p $component_port'"
+  $validateStatusCmd = "su - ${smoke_test_user} -c 'python $validateStatusFilePath $component_type
-p $component_address'"
 
   file { $validateStatusFilePath:
     ensure => present,

Modified: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp/manifests/download_keytabs.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp/manifests/download_keytabs.pp?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp/manifests/download_keytabs.pp
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp/manifests/download_keytabs.pp
Wed May 29 20:46:31 2013
@@ -27,7 +27,7 @@ define hdp::download_keytab(
   $hostnameInPrincipals = 'yes'
 )
 {
-  $hostname = $::fqdn
+  $hostname = $hdp::params::hostname
   if ($hostnameInPrincipals == 'yes') {
     $keytabsrc = "puppet://${masterhost}/modules/keytabs/${hostname}.${keytabfile}"
   } else {

Modified: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
Wed May 29 20:46:31 2013
@@ -202,7 +202,6 @@ class hdp::params()
   $hive_apps_whs_dir = hdp_default("hive_apps_whs_dir", "/apps/hive/warehouse")
   $webhcat_apps_dir = hdp_default("webhcat_apps_dir", "/apps/webhcat")
   $hbase_hdfs_root_dir = hdp_default("hbase-site/hbase.hdfs.root.dir","/apps/hbase/data")
-  $hbase_staging_dir = hdp_default("hbase-site/hbase.bulkload.staging.dir","/apps/hbase/staging")
 
   $yarn_nm_app_log_dir = hdp_default("yarn-site/yarn.nodemanager.remote-app-log-dir","/app-logs")
 
@@ -285,6 +284,7 @@ class hdp::params()
     $pig_conf_dir = "/etc/pig"
     $oozie_conf_dir = "/etc/oozie"
     $hadoop_jar_location = "/usr/share/hadoop"
+    $hadoop_mapred2_jar_location = "/usr/lib/hadoop-mapreduce"
     $hbase_daemon_script = "/usr/bin/hbase-daemon.sh"
     $use_32_bits_on_slaves = false
     $zk_bin = '/usr/sbin'
@@ -317,6 +317,7 @@ class hdp::params()
     $hive_conf_dir = "/etc/hive/conf"
     $hcat_conf_dir = "/etc/hcatalog/conf"
     $hadoop_jar_location = "/usr/lib/hadoop/"
+    $hadoop_mapred2_jar_location = "/usr/lib/hadoop-mapreduce"
     $hbase_daemon_script = "/usr/lib/hbase/bin/hbase-daemon.sh"
     $use_32_bits_on_slaves = false
     $zk_bin = '/usr/lib/zookeeper/bin'
@@ -696,9 +697,9 @@ class hdp::params()
   $component_exists = {} 
   $service_exists = {}
 
-  $is_namenode_master = $::fqdn in $namenode_host
-  $is_jtnode_master   = $::fqdn in $jtnode_host
-  $is_rmnode_master   = $::fqdn in $rm_host
-  $is_hsnode_master   = $::fqdn in $hs_host
-  $is_hbase_master    = $::fqdn in $hbase_master_hosts
+  $is_namenode_master = $hdp::params::hostname in $namenode_host
+  $is_jtnode_master   = $hdp::params::hostname in $jtnode_host
+  $is_rmnode_master   = $hdp::params::hostname in $rm_host
+  $is_hsnode_master   = $hdp::params::hostname in $hs_host
+  $is_hbase_master    = $hdp::params::hostname in $hbase_master_hosts
 }

Modified: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
Wed May 29 20:46:31 2013
@@ -112,6 +112,7 @@ rolesToClass = {
   'HUE_SERVER': 'hdp-hue::server',
   'HDFS_SERVICE_CHECK': 'hdp-hadoop::hdfs::service_check',
   'MAPREDUCE_SERVICE_CHECK': 'hdp-hadoop::mapred::service_check',
+  'MAPREDUCE2_SERVICE_CHECK': 'hdp-yarn::mapred2::service_check',
   'ZOOKEEPER_SERVICE_CHECK': 'hdp-zookeeper::zookeeper::service_check',
   'ZOOKEEPER_QUORUM_SERVICE_CHECK': 'hdp-zookeeper::quorum::service_check',
   'HBASE_SERVICE_CHECK': 'hdp-hbase::hbase::service_check',

Modified: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/Controller.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/Controller.py?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/Controller.py
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/Controller.py
Wed May 29 20:46:31 2013
@@ -133,6 +133,7 @@ class Controller(threading.Thread):
       try:
         if not retry:
           data = json.dumps(self.heartbeat.build(self.responseId, int(hb_interval)))
+          logger.debug("Sending request: " + data)
           pass
         else:
           self.DEBUG_HEARTBEAT_RETRIES += 1

Modified: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/Heartbeat.py?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
Wed May 29 20:46:31 2013
@@ -57,6 +57,8 @@ class Heartbeat:
       heartbeat['reports'] = queueResult['reports']
       heartbeat['componentStatus'] = queueResult['componentStatus']
       pass
+    logger.info("Sending heartbeat with response id: " + str(id) + " and "
+                "timestamp: " + str(timestamp))
     logger.debug("Heartbeat : " + pformat(heartbeat))
 
     if (int(id) >= 0) and state_interval > 0 and (int(id) % state_interval) == 0:

Modified: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py
Wed May 29 20:46:31 2013
@@ -82,7 +82,10 @@ def generateManifest(parsedJson, fileNam
     
   #writing imports from external static file
   writeImports(outputFile=manifest, modulesdir=modulesdir, importsList=AmbariConfig.imports)
-  
+
+  #writing hostname
+  writeHostnames(manifest)
+
   #writing nodes
   writeNodes(manifest, clusterHostInfo)
   
@@ -114,6 +117,12 @@ def generateManifest(parsedJson, fileNam
   manifest.close()
     
 
+def writeHostnames(outputFile):
+  fqdn = hostname.hostname()
+  public_fqdn = hostname.public_hostname()
+  outputFile.write('$myhostname' + " = '" + fqdn + "'" + os.linesep)
+  outputFile.write('$public_hostname' + " = '" + public_fqdn + "'" + os.linesep)
+
   #write nodes
 def writeNodes(outputFile, clusterHostInfo):
   if clusterHostInfo.has_key('zookeeper_hosts'):
@@ -167,16 +176,12 @@ def writeHostAttributes(outputFile, host
 #write flat configurations
 def writeFlatConfigurations(outputFile, flatConfigs):
   flatDict = {}
-  fqdn = hostname.hostname()
-  public_fqdn = hostname.public_hostname()
   logger.debug("Generating global configurations =>\n" + pprint.pformat(flatConfigs))
   for flatConfigName in flatConfigs.iterkeys():
     for flatConfig in flatConfigs[flatConfigName].iterkeys():
       flatDict[flatConfig] = flatConfigs[flatConfigName][flatConfig]
   for gconfigKey in flatDict.iterkeys():
     outputFile.write('$' + gconfigKey + " = '" + flatDict[gconfigKey] + "'" + os.linesep)
-  outputFile.write('$myhostname' + " = '" + fqdn + "'" + os.linesep)
-  outputFile.write('$public_hostname' + " = '" + public_fqdn + "'" + os.linesep)
 
 #write xml configurations
 def writeNonGlobalConfigurations(outputFile, xmlConfigs):

Modified: incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/clusters.md
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/clusters.md?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/clusters.md (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/clusters.md Wed May 29
20:46:31 2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-cluster.md
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-cluster.md?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-cluster.md (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-cluster.md Wed
May 29 20:46:31 2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-component.md
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-component.md?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-component.md (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-component.md Wed
May 29 20:46:31 2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-host.md
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-host.md?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-host.md (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-host.md Wed May
29 20:46:31 2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-hostcomponent.md
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-hostcomponent.md?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-hostcomponent.md
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-hostcomponent.md
Wed May 29 20:46:31 2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-service.md
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-service.md?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-service.md (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/create-service.md Wed
May 29 20:46:31 2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/delete-cluster.md
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/delete-cluster.md?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/delete-cluster.md (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/delete-cluster.md Wed
May 29 20:46:31 2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/host-component-resources.md
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/host-component-resources.md?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/host-component-resources.md
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/host-component-resources.md
Wed May 29 20:46:31 2013
@@ -158,3 +158,4 @@ A component can be stopped through the A
 The user can update the desired state of a host component through the API to be MAINTENANCE
(see [update host component](update-hostcomponent.md)).  When a host component is into maintenance
state it is basically taken off line. This state can be used, for example, to move a component
like NameNode.  The NameNode component can be put in MAINTENANCE mode and then a new NameNode
can be created for the service. 
 
 
+

Modified: incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/host-components.md
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/host-components.md?rev=1487638&r1=1487637&r2=1487638&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/host-components.md (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-server/docs/api/v1/host-components.md Wed
May 29 20:46:31 2013
@@ -94,4 +94,4 @@ Returns a collection of components runni
     		},
     		...
 		]
-	}
+	}
\ No newline at end of file



Mime
View raw message