Skip to content

Commit e7cd78b

Browse files
committed
HADOOP-5458. Remove leftover Chukwa entries from build, etc.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@752405 13f79535-47bb-0310-9956-ffa450edef68
1 parent 9e70b70 commit e7cd78b

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

.gitignore

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,6 @@ docs/api/
3232
logs/
3333
src/contrib/ec2/bin/hadoop-ec2-env.sh
3434
src/contrib/index/conf/index-config.xml
35-
src/contrib/chukwa/conf/alert.conf
36-
src/contrib/chukwa/conf/chukwa-slaves
37-
src/contrib/chukwa/conf/initial_adaptors
38-
src/contrib/chukwa/conf/mdl.xml
39-
src/contrib/chukwa/conf/chukwa-agents
40-
src/contrib/chukwa/conf/chukwa-env.sh
41-
src/contrib/chukwa/conf/chukwa-agent-conf.xml
42-
src/contrib/chukwa/conf/chukwa-collector-conf.xml
43-
src/contrib/chukwa/conf/collectors
4435
src/docs/build
4536
src/docs/cn/build
4637
src/docs/cn/src/documentation/sitemap.xmap

CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,8 @@ Trunk (unreleased changes)
283283
HADOOP-5456. Fix javadoc links to ClientProtocol#restoreFailedStorage(..).
284284
(Boris Shkolnik via szetszwo)
285285

286+
HADOOP-5458. Remove leftover Chukwa entries from build, etc. (cdouglas)
287+
286288
Release 0.20.0 - Unreleased
287289

288290
INCOMPATIBLE CHANGES

src/contrib/build.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
<fileset dir="." includes="streaming/build.xml"/>
5151
<fileset dir="." includes="fairscheduler/build.xml"/>
5252
<fileset dir="." includes="capacity-scheduler/build.xml"/>
53-
<fileset dir="." includes="chukwa/build.xml"/>
5453
</subant>
5554
</target>
5655

src/contrib/fuse-dfs/ivy.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<license name="Apache 2.0"/>
55
<ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
66
<description>
7-
Apache Hadoop Chukwa
7+
FUSE plugin for HDFS
88
</description>
99
</info>
1010
<configurations defaultconfmapping="default">

0 commit comments

Comments
 (0)