Author: tomwhite
Date: Thu Jul 1 05:17:02 2010
New Revision: 959514
URL: http://svn.apache.org/viewvc?rev=959514&view=rev
Log:
Merge -r 959512:959513 from trunk to branch-0.21. Fixes: HDFS-1267.
Modified:
hadoop/hdfs/branches/branch-0.21/CHANGES.txt
hadoop/hdfs/branches/branch-0.21/src/contrib/fuse-dfs/src/fuse_connect.c
Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=959514&r1=959513&r2=959514&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Thu Jul 1 05:17:02 2010
@@ -899,6 +899,8 @@ Release 0.21.0 - Unreleased
HDFS-1212. Harmonize HDFS JAR library versions with Common. (tomwhite)
+ HDFS-1267. fuse-dfs does not compile. (Devaraj Das via tomwhite)
+
Release 0.20.3 - Unreleased
IMPROVEMENTS
Modified:
hadoop/hdfs/branches/branch-0.21/src/contrib/fuse-dfs/src/fuse_connect.c
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/contrib/fuse-dfs/src/fuse_connect.c?rev=959514&r1=959513&r2=959514&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/src/contrib/fuse-dfs/src/fuse_connect.c
(original)
+++ hadoop/hdfs/branches/branch-0.21/src/contrib/fuse-dfs/src/fuse_connect.c
Thu Jul 1 05:17:02 2010
@@ -37,7 +37,7 @@ hdfsFS doConnectAsUser(const char *hostn
return NULL;
int numgroups = 0;
char **groups = getGroups(uid, &numgroups);
- hdfsFS fs = hdfsConnectAsUser(hostname, port, user, (const char **)groups,
numgroups);
+ hdfsFS fs = hdfsConnectAsUser(hostname, port, user);
freeGroups(groups, numgroups);
if (user)
free(user);
