Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,847 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

2229 Commits

Author SHA1 Message Date
Benoy Antony 2eabbae292 HADOOP-10852 Fix thread safety issues in NetgroupCache. (Benoy Antony) 
(cherry picked from commit a095622f36)
 2014-12-15 14:02:15 -08:00
cnauroth b9f1e88df7 HADOOP-11396. Provide navigation in the site documentation linking to the Hadoop Compatible File Systems. Contributed by Chris Nauroth. 
(cherry picked from commit cbfb996fb4)
 2014-12-12 23:32:55 -08:00
cnauroth 21347a05f5 HADOOP-11394. hadoop-aws documentation missing. Contributed by Chris Nauroth. 
(cherry picked from commit 9458cd5bce)
 2014-12-12 23:29:40 -08:00
Colin Patrick Mccabe b521d91c0f HADOOP-11238. Update the NameNode's Group Cache in the background when possible (Chris Li via Colin P. McCabe) 
(cherry picked from commit e5a6925199)
 2014-12-12 16:32:04 -08:00
Haohui Mai 5bc3aae6fb HADOOP-11389. Clean up byte to string encoding issues in hadoop-common. Contributed by Haohui Mai. 2014-12-11 16:51:46 -08:00
Gera Shegalov 8437c31b67 HADOOP-11211. mapreduce.job.classloader.system.classes semantics should be order-independent. (Yitong Zhou via gera) 
(cherry picked from commit 0bcea111e5)
 2014-12-11 13:29:40 -08:00
Haohui Mai 38afeb5f12 HADOOP-11386. Replace \n by %n in format hadoop-common format strings. Contributed by Li Lu. 2014-12-10 14:37:39 -08:00
Haohui Mai df5af744ad HADOOP-11388. Remove deprecated o.a.h.metrics.file.FileContext. Contributed by Li Lu. 2014-12-10 12:49:26 -08:00
Haohui Mai 7e51350d9a HADOOP-10482. Fix various findbugs warnings in hadoop-common. Contributed by Haohui Mai. 2014-12-10 12:44:32 -08:00
Haohui Mai a1e4a12dc0 HADOOP-11381. Fix findbugs warnings in hadoop-distcp, hadoop-aws, hadoop-azure, and hadoop-openstack. Contributed by Li Lu. 2014-12-09 20:46:44 -08:00
Colin Patrick Mccabe 3637bc8cd9 HADOOP-11349. RawLocalFileSystem leaks file descriptor while creating a file if creat succeeds but chmod fails. (Varun Saxena via Colin P. McCabe) 
(cherry picked from commit 03867eb1bb)
 2014-12-09 14:32:25 -08:00
Haohui Mai 784f481473 HADOOP-11378. Fix new findbugs warnings in hadoop-kms. Contributed by Li Lu. 2014-12-09 13:10:09 -08:00
Haohui Mai b68d51e898 HADOOP-11379. Fix new findbugs warnings in hadoop-auth*. Contributed by Li Lu. 2014-12-09 13:09:01 -08:00
Jing Zhao e8e86e3ec7 HDFS-7498. Simplify the logic in INodesInPath. Contributed by Jing Zhao. 2014-12-09 11:38:07 -08:00
Haohui Mai fa9ca25019 HADOOP-11273. TestMiniKdc failure: login options not compatible with IBM JDK. Contributed by Gao Zhong Liang. 2014-12-09 10:57:41 -08:00
Haohui Mai 49aacee2cb HADOOP-11372. Fix new findbugs warnings in mapreduce-examples. Contributed by Li Lu. 2014-12-09 10:49:11 -08:00
Andrew Wang deaa172e7a HADOOP-11368. Fix SSLFactory truststore reloader thread leak in KMSClientProvider. Contributed by Arun Suresh. 
(cherry picked from commit 74d4bfded9)
 2014-12-09 10:47:33 -08:00
Haohui Mai 759179e631 HADOOP-11369. Fix new findbugs warnings in hadoop-mapreduce-client, non-core directories. Contributed by Li Lu. 2014-12-09 10:46:25 -08:00
Haohui Mai 1b8b51704a HADOOP-11367. Fix warnings from findbugs 3.0 in hadoop-streaming. Contributed by Li Lu. 2014-12-09 10:42:17 -08:00
Haohui Mai c9e9f82ec6 HADOOP-10476. Bumping the findbugs version to 3.0.0. Contributed by Haohui Mai. 2014-12-09 10:38:43 -08:00
Steve Loughran 2bc3f1064f HADOOP-10134 [JDK8] Fix Javadoc errors caused by incorrect or illegal tags in doc comments. 2014-12-09 11:15:19 +00:00
Steve Loughran a7be36384a HADOOP-11363 Hadoop maven surefire-plugin uses must set heap size. 2014-12-09 11:04:59 +00:00
Haohui Mai e2c1ef4deb HADOOP-11287. Simplify UGI#reloginFromKeytab for Java 7+. Contributed by Li Lu. 2014-12-08 21:10:49 -08:00
Andrew Wang 46a7365164 HADOOP-11329. Add JAVA_LIBRARY_PATH to KMS startup options. Contributed by Arun Suresh. 
(cherry picked from commit ddffcd8fac)
 2014-12-08 13:45:34 -08:00
Jing Zhao 582f96e41d HADOOP-11354. ThrottledInputStream doesn't perform effective throttling. Contributed by Ted Yu. 2014-12-08 11:09:34 -08:00
cnauroth 143a5b67d8 HDFS-7384. getfacl command and getAclStatus output should be in sync. Contributed by Vinayakumar B. 
(cherry picked from commit ffe942b82c)
 2014-12-08 10:28:25 -08:00
Steve Loughran 275561d848 HADOOP-10530 Make hadoop build on Java7+ only (stevel) 2014-12-08 15:30:34 +00:00
cnauroth 308b75571b HADOOP-11313. Adding a document about NativeLibraryChecker. Contributed by Tsuyoshi OZAWA. 
(cherry picked from commit 1b3bb9e7a3)
 2014-12-06 20:12:56 -08:00
Andrew Wang dabdd2d746 HADOOP-11343. Overflow is not properly handled in caclulating final iv for AES CTR. Contributed by Jerry Chen. 
(cherry picked from commit 0707e4eca9)
 2014-12-05 18:20:23 -08:00
Andrew Wang b8e4fffa49 HADOOP-11355. When accessing data in HDFS and the key has been deleted, a Null Pointer Exception is shown. Contributed by Arun Suresh. 
(cherry picked from commit 9cdaec6a6f)
 2014-12-05 12:01:32 -08:00
Haohui Mai 4f612f148b HADOOP-11356. Removed deprecated o.a.h.fs.permission.AccessControlException. Contributed by Li Lu. 2014-12-05 10:50:03 -08:00
Colin Patrick Mccabe a0976152e6 HADOOP-11348. Remove unused variable from CMake error message for finding openssl (Dian Fu via Colin P. McCabe) 
(cherry picked from commit 565b0e60a8)
 2014-12-04 12:54:59 -08:00
Aaron T. Myers 534a021e70 HADOOP-11332. KerberosAuthenticator#doSpnegoSequence should check if kerberos TGT is available in the subject. Contributed by Dian Fu. 
(cherry picked from commit 9d1a8f5897)
 2014-12-03 18:54:26 -08:00
Andrew Wang 696e15f0d1 HADOOP-11342. KMS key ACL should ignore ALL operation for default key ACL and whitelist key ACL. Contributed by Dian Fu. 
(cherry picked from commit 1812241ee1)
 2014-12-03 12:00:29 -08:00
Andrew Wang c962eef533 HADOOP-11344. KMS kms-config.sh sets a default value for the keystore password even in non-ssl setup. Contributed by Arun Suresh. 
(cherry picked from commit 3d48ad7eb4)
 2014-12-02 19:04:33 -08:00
stack 6d904985e8 HADOOP-11301. [optionally] update jmx cache to drop old metrics (Maysam Yabandeh via stack) 
(cherry picked from commit b36f292982)
 2014-12-01 23:08:16 -08:00
stack 76245dfccd Revert "HBASE-11301 [optionally] update jmx cache to drop old metrics (Maysam Yabandeh via stack)" 
This reverts commit fd6a801ddb.

Refers to an HBASE rather than HADOOP issue.
 2014-12-01 23:02:32 -08:00
stack fd6a801ddb HBASE-11301 [optionally] update jmx cache to drop old metrics (Maysam Yabandeh via stack) 
(cherry picked from commit 74f4d8590d)
 2014-12-01 22:55:12 -08:00
Andrew Wang 881c77107e HADOOP-11341. KMS support for whitelist key ACLs. Contributed by Arun Suresh. 
(cherry picked from commit 31b4d2daa1)
 2014-12-01 21:58:21 -08:00
Colin Patrick Mccabe f9c5dec152 CHANGES.txt: add HADOOP-11257 
(cherry picked from commit c1f2bb2d31)
 2014-12-01 21:58:15 -08:00
Andrew Wang 084667aad9 HADOOP-11337. KeyAuthorizationKeyProvider access checks need to be done atomically. Contributed by Dian Fu. 
(cherry picked from commit 9fa2990257)
 2014-12-01 21:22:03 -08:00
Colin Patrick Mccabe f6d1bf5ed1 HADOOP-11333. Fix deadlock in DomainSocketWatcher when the notification pipe is full (zhaoyunjiong via cmccabe) 
(cherry picked from commit 86e3993def)
 2014-12-01 11:48:53 -08:00
Colin Patrick Mccabe 8f98225418 HADOOP-11257. Update "hadoop jar" documentation to warn against using it for launching yarn jars (iwasakims via cmccabe) 2014-11-26 13:42:07 -08:00
Steve Loughran 6a01497d7c HDFS-6803 Document DFSClient#DFSInputStream expectations reading and preading in concurrent context. (stack via stevel) 2014-11-26 11:43:46 +00:00
Andrew Wang 8018d1af58 HADOOP-11173. Improve error messages for some KeyShell commands. 
(cherry picked from commit fae266bbf1)
 2014-11-25 16:13:37 -08:00
Andrew Wang aad16f8f5c HADOOP-11300. KMS startup scripts must not display the keystore / truststore passwords. Contributed by Arun Suresh. 
(cherry picked from commit 56f3eecc12)
 2014-11-25 15:12:09 -08:00
yliu 4b62d6d2fd HADOOP-11322. key based ACL check in KMS always check KeyOpType.MANAGEMENT even actual KeyOpType is not MANAGEMENT. (Dian Fu via yliu) 2014-11-25 01:12:31 +08:00
Colin Patrick Mccabe 4435ac9af5 HDFS-7419. Improve error messages for DataNode hot swap drive feature (Lei Xu via Colin P. Mccabe) 
(cherry picked from commit f636f9d943)
 2014-11-24 10:58:05 -08:00
Karthik Kambatla e0df934ed1 Update release date for 2.5.2 
(cherry picked from commit 1e9a3f42ff)
 2014-11-21 14:34:47 -08:00
Andrew Wang 85bdc3a013 HADOOP-11323. WritableComparator#compare keeps reference to byte array. Contributed by Wilfred Spiegelenburg. 
(cherry picked from commit eb4045e765)
 2014-11-20 11:05:50 -08:00
cnauroth 00a06e28d4 HADOOP-11201. Hadoop Archives should support globs resolving to files. Contributed by Gera Shegalov. 
(cherry picked from commit 79301e80d7)
 2014-11-18 17:10:24 -08:00
Jian He 1412e712b4 YARN-2157. Added YARN metrics in the documentaion. Contributed by Akira AJISAKA 
(cherry picked from commit 90a968d675)
 2014-11-18 16:13:08 -08:00
Andrew Wang 1e14792be6 HADOOP-11312. Fix unit tests to not use uppercase key names. 
(cherry picked from commit bcd402ae38)
 2014-11-18 10:48:10 -08:00
Jason Lowe 5125a8e59e HADOOP-11309. System class pattern package.Foo should match package.Foo$Bar, too. Contributed by Gera Shegalov 
(cherry picked from commit b4ca727690)
 2014-11-18 17:23:37 +00:00
Andrew Wang 541172f2ee HDFS-6982. nntop: top­-like tool for name node users. (Maysam Yabandeh via wang) 
(cherry picked from commit dcb8e24427)
 2014-11-17 17:34:02 -08:00
Andrew Wang 1deefa6cf1 HADOOP-11311. Restrict uppercase key names from being created with JCEKS. 
(cherry picked from commit 48d62fad80)
 2014-11-17 13:59:55 -08:00
Brandon Li 7b2a884077 HDFS-7146. NFS ID/Group lookup requires SSSD enumeration on the server. Contributed by Yongjun Zhang 
(cherry picked from commit 351c5561c2)
 2014-11-17 13:25:43 -08:00
Aaron T. Myers d35eba7b1f HADOOP-11157. ZKDelegationTokenSecretManager never shuts down listenerThreadPool. Contributed by Arun Suresh. 
(cherry picked from commit 07d489e6230682e0553840bb1a0e446acb9f8d19)
 2014-11-17 13:02:59 -08:00
Haohui Mai 6eb88c278c HDFS-7279. Use netty to implement DatanodeWebHdfsMethods. Contributed by Haohui Mai. 2014-11-17 12:56:03 -08:00
cnauroth 72207f65aa HDFS-7386. Replace check "port number < 1024" with shared isPrivilegedPort method. Contributed by Yongjun Zhang. 
(cherry picked from commit 1925e2a4ae)
 2014-11-14 16:46:24 -08:00
Karthik Kambatla 8e524e8d60 HADOOP-11307. create-release script should run git clean first (kasha) 
(cherry picked from commit 4fb96dbe3b)
 2014-11-14 15:37:46 -08:00
Colin Patrick Mccabe 5b90e428a5 Revert HADOOP-11257 because it didn't get a jenkins run yet 2014-11-14 13:06:41 -08:00
Colin Patrick Mccabe 490df57fa2 HADOOP-11257. Update "hadoop jar" documentation to warn against using it for launching yarn jars (iwasakims via cmccabe) 
(cherry picked from commit 10c98aed38)
 2014-11-14 12:56:31 -08:00
Ravi Prakash 45692effe4 MAPREDUCE-5918. LineRecordReader can return the same decompressor to CodecPool multiple times (Sergey Murylev via raviprak) 2014-11-14 03:48:28 -08:00
Arun C. Murthy fc324d7062 Preparing to release hadoop-2.6.0-rc1. 
(cherry picked from commit 9ff7315cbe)
 2014-11-13 13:03:13 -08:00
cnauroth 9c94945fe9 HADOOP-11291. Log the cause of SASL connection failures. Contributed by Stephen Chu. 
(cherry picked from commit 7dae5b5a88)
 2014-11-12 21:54:40 -08:00
cnauroth 69a7780ee5 HADOOP-7984. Add hadoop --loglevel option to change log level. Contributed by Aikira AJISAKA. 2014-11-12 21:44:05 -08:00
Arun C. Murthy 3ee522abb1 HADOOP-9576. Merging to branch-2.6 for hadoop-2.6.0-rc1. 2014-11-12 09:56:17 -08:00
Jian He 2b125b3a39 HADOOP-9576. Changed NetUtils#wrapException to throw EOFException instead of wrapping it as IOException. Contributed by Steve Loughran 
(cherry picked from commit 86bf8c7193)
 2014-11-10 17:26:12 -08:00
Haohui Mai d47a34fc66 HADOOP-11296. Nfs3FileAttributes should not change the values of rdev, nlink and size in the constructor. Contributed by Brandon Li. 2014-11-10 15:43:16 -08:00
Karthik Kambatla 92de44c2c5 Set the release date for 2.5.2 
(cherry picked from commit 68a0508728)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-11-10 15:23:43 -08:00
Haohui Mai ebb0636c9d HADOOP-11289. Fix typo in RpcUtil log message. Contributed by Charles Lamb. 2014-11-10 11:05:37 -08:00
Arun C. Murthy adfb830a2b Preparing to release hadoop-2.6.0: Set version in branch-2 to 2.7.0-SNAPSHOT. 2014-11-09 19:19:02 -08:00
Arun C. Murthy d827b7a013 Release Notes for hadoop-2.6.0. 2014-11-09 19:15:37 -08:00
Arun C. Murthy cff08dab5e Updated CHANGES.txt to reflect hadoop-2.6.0 release dates. 
(cherry picked from commit 770cc14442)
 2014-11-09 18:48:01 -08:00
Arun C. Murthy e3877e8051 HADOOP-10786. Moved to hadoop-2.7.X. 
(cherry picked from commit 14b87b70a8)
 2014-11-09 18:19:47 -08:00
Haohui Mai 9e63cb4492 HADOOP-10786. Fix UGI#reloginFromKeytab on Java 8. Contributed by Stephen Chu. 2014-11-09 17:48:40 -08:00
Arun C. Murthy 1f5bad04ce HADOOP-11286. Copied LimitInputStream from guava-0.14 to hadoop to avoid issues with newer versions of guava in applications. Contributed by Christopher Tubbs. 
(cherry picked from commit 6caa8100d5)
 2014-11-09 05:23:10 -08:00
Arun C. Murthy 242404b025 HADOOP-10563. Fix bad merge which messed up hadoop-common/CHANGES.txt. 2014-11-09 05:23:05 -08:00
cnauroth 3ef876712c HADOOP-11282. Skip NFS TestShellBasedIdMapping tests that are irrelevant on Windows. Contributed by Chris Nauroth. 
(cherry picked from commit 68db5b3736)
 2014-11-07 14:32:04 -08:00
cnauroth a3496b7e01 HADOOP-11280. TestWinUtils#testChmod fails after removal of NO_PROPAGATE_INHERIT_ACE. Contributed by Chris Nauroth. 
(cherry picked from commit 42bbe3794e)
 2014-11-07 00:04:13 -08:00
Jing Zhao 7a91ea32e1 Revert "HADOOP-11274. ConcurrentModificationException in Configuration Copy Constructor. Contributed by Junping Du." 
This reverts commit 16b3482467.
 2014-11-06 18:30:35 -08:00
Jing Zhao 22ecbd4ab3 HADOOP-11274. ConcurrentModificationException in Configuration Copy Constructor. Contributed by Junping Du. 2014-11-06 17:00:11 -08:00
Jason Lowe c0bbb72912 MAPREDUCE-5960. JobSubmitter's check whether job.jar is local is incorrect with no authority in job jar path. Contributed by Gera Shegalov 
(cherry picked from commit 10f9f5101c)
 2014-11-06 15:12:06 +00:00
Aaron T. Myers d698ed1d6f HADOOP-11187 NameNode - KMS communication fails after a long period of inactivity. Contributed by Arun Suresh. 
(cherry picked from commit d593035d50e9997f31ddd67275b6e68504f9ca3c)
 2014-11-05 18:17:43 -08:00
Aaron T. Myers e96f0c6aae HADOOP-11272. Allow ZKSignerSecretProvider and ZKDelegationTokenSecretManager to use the same curator client. Contributed by Arun Suresh. 
(cherry picked from commit 8a261e68e4)
 2014-11-05 17:47:49 -08:00
Aaron T. Myers 9082fe4e20 HADOOP-10714. AmazonS3Client.deleteObjects() need to be limited to 1000 entries per call. Contributed by Juan Yu. 
(cherry picked from commit 6ba52d88ec)
 2014-11-05 17:24:55 -08:00
Haohui Mai 1857623634 HADOOP-11267. TestSecurityUtil fails when run with JDK8 because of empty principal names. Contributed by Stephen Chu. 2014-11-05 15:25:46 -08:00
Haohui Mai 44f9790247 HADOOP-11266. Remove no longer supported activation properties for packaging from pom. Contributed by Masatake Iwasaki. 2014-11-05 11:15:47 -08:00
cnauroth a339fd3646 HADOOP-11265. Credential and Key Shell Commands not available on Windows. Contributed by Larry McCay. 
(cherry picked from commit a7fbd4e633)
 2014-11-05 08:44:16 -08:00
Vinayakumar B 2d0c56e898 HADOOP-11271. Use Time.monotonicNow() in Shell.java instead of Time.now() (Contributed by Vinayakumar B) 
(cherry picked from commit 8e9502e05d)
 2014-11-05 14:49:19 +05:30
Haohui Mai ab07fef5b7 HADOOP-11269. Add java 8 profile for hadoop-annotations. Contributed by Li Lu. 2014-11-04 18:01:02 -08:00
Haohui Mai fa92b40f09 HADOOP-11230. Add missing dependency of bouncycastle for kms, httpfs, hdfs, MR and YARN. Contributed by Robert Kanter. 2014-11-04 17:53:00 -08:00
Haohui Mai bfcf0c83a2 HADOOP-11268. Update BUILDING.txt to remove the workaround for tools.jar. Contributed by Li Lu. 2014-11-04 17:47:17 -08:00
Karthik Kambatla 6f9484221e Adding release 2.5.2 to CHANGES.txt 
(cherry picked from commit 4de56d27fb)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-11-04 16:51:54 -08:00
Karthik Kambatla 395d4ba766 HADOOP-11260. Patch up Jetty to disable SSLv3. (Mike Yoder via kasha) 
(cherry picked from commit dbf30e3c0e)
 2014-11-04 16:22:09 -08:00
Haohui Mai 7e2bdd5255 HADOOP-10717. HttpServer2 should load jsp DTD from local jars instead of going remote. Contributed by Dapeng Sun. 2014-11-04 15:02:25 -08:00
Haohui Mai aa09c4c342 HADOOP-10563. Remove the dependency of jsp in trunk. Contributed by Haohui Mai. 2014-11-04 14:52:51 -08:00
Haohui Mai 3bdfd6e58e HADOOP-10847. Remove the usage of sun.security.x509.* in testing code. Contributed by Pascal Oliva. 2014-11-04 10:52:22 -08:00
cnauroth f4ed787669 HADOOP-11165. TestUTF8 fails when run against java 8. Contributed by Stephen Chu. 
(cherry picked from commit 85da71c2d3)
 2014-11-04 10:29:29 -08:00
Kihwal Lee c8648bd27e HADOOP-10987. Provide an iterator-based listing API for FileSystem. Contributed by Kihwal Lee. 2014-11-03 08:23:34 -06:00
Vinod Kumar Vavilapalli 0cbc115704 HADOOP-11254. Changed visibility of AccessControlList to be public for consumption by ecosystem. Contributed by Zhijie Shen. 
(cherry picked from commit b18e8a272e)
 2014-11-01 11:11:04 -07:00
Zhijie Shen e286ae90b7 HADOOP-11241. Fixed intermittent TestNMSimulator failure due to timing issue. Contributed by Varun Vasudev. 
(cherry picked from commit 260ab6d5f4)
 2014-10-31 18:04:05 -07:00
Jian He a87f827ae4 YARN-2770. Added functionality to renew/cancel TimeLineDelegationToken. Contributed by Zhijie Shen 
(cherry picked from commit 1b4be91866)
 2014-10-31 13:17:19 -07:00
Haohui Mai 5e5585a7e0 HADOOP-11253. Hadoop streaming test TestStreamXmlMultipleRecords fails on Windows. Contributed by Varun Vasudev. 2014-10-31 11:54:18 -07:00
cnauroth 57fa43ab0a HDFS-7313. Support optional configuration of AES cipher suite on DataTransferProtocol. Contributed by Chris Nauroth. 
(cherry picked from commit 5573b3476a)
 2014-10-30 22:52:33 -07:00
Brandon Li cc900b213c update CHANGES.txt to move HADOOP-11247 to 2.6 2014-10-30 13:31:40 -07:00
Tsz-Wo Nicholas Sze 2b5baa6714 HADOOP-11221. IdentityHashStore assumes System.identityHashCode() is non-negative. Contributed by Jinghui Wang 2014-10-30 11:00:24 -07:00
Colin Patrick Mccabe e107ea5177 HADOOP-11250. fix endmacro of set_find_shared_library_without_version in CMakeLists (Yi Liu via Colin P. McCabe) 
(cherry picked from commit e488f0d93b)
 2014-10-30 10:38:17 -07:00
yliu 51f621c01c HADOOP-11216. Improve Openssl library finding. (cmccabe via yliu) 2014-10-30 10:38:52 +08:00
Haohui Mai c7d1db7495 HADOOP-11247. Fix a couple javac warnings in NFS. Contributed by Brandon Li. 2014-10-29 17:54:37 -07:00
Jason Lowe 0c15130db2 HADOOP-9740. Fix FsShell '-text' command to be able to read Avro files stored in HDFS and other filesystems. Contributed by Allan Yan 2014-10-29 20:23:17 +00:00
Colin Patrick Mccabe f6102831bc HADOOP-11186: documentation should talk about hadoop.htrace.spanreceiver.classes, not hadoop.trace.spanreceiver.classes (cmccabe) 
(cherry picked from commit c2575fb046)
 2014-10-29 12:14:30 -07:00
cnauroth b4446cb370 HADOOP-11068. Match hadoop.auth cookie format to jetty output. Contributed by Gregory Chanan. 
(cherry picked from commit 5c900b522e)
 2014-10-29 11:21:37 -07:00
Brandon Li 6caf36f9eb HADOOP-11195. Move Id-Name mapping in NFS to the hadoop-common area for better maintenance. Contributed by Yongjun Zhang 
(cherry picked from commit 72a556d3b0)
 2014-10-29 11:06:44 -07:00
Kihwal Lee 45b6dea95f MAPREDUCE-6022. map_input_file is missing from streaming job 
environment. Contributed by Jason Lowe.
(cherry picked from commit b056048114)
 2014-10-29 12:30:08 -05:00
Karthik Kambatla 160aebcae2 HADOOP-11243. SSLFactory shouldn't allow SSLv3. (Wei Yan via kasha) 
(cherry picked from commit 3c5f5af118)
 2014-10-28 18:08:00 -07:00
Karthik Kambatla 0aec884704 HADOOP-11217. Disable SSLv3 in KMS. (Robert Kanter via kasha) 
(cherry picked from commit 1a78082338)
 2014-10-28 17:31:55 -07:00
cnauroth c2790932bd HDFS-7291. Persist in-memory replicas with appropriate unbuffered copy API on POSIX and Windows. Contributed by Xiaoyu Yao. 
(cherry picked from commit c6f04f391b)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-28 14:17:35 -07:00
yliu 8b812a35b8 HDFS-6606. Optimize HDFS Encrypted Transport performance. (yliu) 2014-10-28 21:16:34 +08:00
yliu 2e156f01a2 HADOOP-11233. hadoop.security.kms.client.encrypted.key.cache.expiry property spelled wrong in core-default. (Stephen Chu via yliu) 2014-10-28 14:44:13 +08:00
cnauroth 5dbd27f8b4 HDFS-6934. Revert files accidentally committed. 
(cherry picked from commit 5b1dfe78b8)
 2014-10-27 12:15:47 -07:00
cnauroth 3d67da502a HDFS-6934. Move checksum computation off the hot path when writing to RAM disk. Contributed by Chris Nauroth. 
(cherry picked from commit 463aec1171)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
 2014-10-27 11:50:47 -07:00
Jian He 2d3c64943d YARN-2591. Fixed AHSWebServices to return FORBIDDEN(403) if the request user doesn't have access to the history data. Contributed by Zhijie Shen 
(cherry picked from commit c05b581a55)
 2014-10-27 10:46:37 -07:00
Harsh J c88ac8a738 HADOOP-11236. NFS: Fix javadoc warning in RpcProgram.java. Contributed by Abhiraj Butala. (harsh) 2014-10-27 19:13:50 +05:30
Vinod Kumar Vavilapalli b1e17d2dab HADOOP-11170. Pulling into branch-2.6 also, fixing CHANGES.txt. 
(cherry picked from commit 9ada9284d8)
 2014-10-26 11:26:18 -07:00
Vinod Kumar Vavilapalli 36d3f1fcca YARN-2743. Fixed a bug in ResourceManager that was causing RMDelegationToken identifiers to be tampered and thus causing app submission failures in secure mode. Contributed by Jian He. 
(cherry picked from commit 0186645505)
 2014-10-26 11:15:45 -07:00
Byron Wong d991cd52d8 HADOOP-6857. FsShell should report raw disk usage including replication factor. Contributed by Byron Wong. 2014-10-25 12:39:03 -07:00
Jian He 299c9b456d HADOOP-11228. Winutils task: unsecure path should not call AddNodeManagerAndUserACEsToObject. Contributed by Remus Rusanu 
(cherry picked from commit f7e89bb349)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2014-10-24 12:54:00 -07:00
Colin Patrick Mccabe caa658a015 HDFS-7223. Tracing span description of IPC client is too long (iwasakims via cmccabe) 
(cherry picked from commit 5b56ac4c72)
 2014-10-23 19:15:08 -07:00
Karthik Kambatla c99d89f2c6 HADOOP-11170. ZKDelegationTokenSecretManager fails to renewToken created by a peer. (Arun Suresh and Gregory Chanan via kasha) 
(cherry picked from commit db45f047ab)
 2014-10-23 17:06:36 -07:00
Colin Patrick Mccabe a36fd88671 HDFS-7227. Fix findbugs warning about NP_DEREFERENCE_OF_READLINE_VALUE in SpanReceiverHost (cmccabe) 
(cherry picked from commit 7ab754545d)
 2014-10-23 13:26:10 -07:00
Jian He 1c235a4448 YARN-2198. Remove the need to run NodeManager as privileged account for Windows Secure Container Executor. Contributed by Remus Rusanu 
(cherry picked from commit 3b12fd6cfb)
 2014-10-22 15:58:26 -07:00
Karthik Kambatla b3bb4fdc7c HADOOP-11122. Fix findbugs in ZK DelegationTokenSecretManagers. (Arun Suresh via kasha) 
(cherry picked from commit 70719e5c62)
 2014-10-22 14:33:56 -07:00
Haohui Mai 3476b9630f HADOOP-10748. HttpServer2 should not load JspServlet. Contributed by Haohui Mai. 2014-10-22 14:26:57 -07:00
cnauroth a066134277 YARN-2720. Windows: Wildcard classpath variables not expanded against resources contained in archives. Contributed by Craig Welch. 
(cherry picked from commit 6637e3cf95)
 2014-10-21 12:34:58 -07:00
Karthik Kambatla f8e4cec08a HADOOP-11194. Ignore .keep files (kasha) 
(cherry picked from commit d5084b9fa3)
 2014-10-20 11:29:49 -04:00
Vinod Kumar Vavilapalli 5e239640f9 HADOOP-11207. Enhanced common DelegationTokenAuthenticationHandler to support proxy-users on Delegation-token management operations. Contributed by Zhijie Shen. 
(cherry picked from commit 1137557816)
 2014-10-17 15:57:08 -07:00
arp 0ee251ea26 HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsLocatedFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/hdfs.proto
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
 2014-10-17 13:42:04 -07:00
cnauroth a181daf458 HDFS-7090. Use unbuffered writes when persisting in-memory replicas. Contributed by Xiaoyu Yao. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-17 13:42:03 -07:00
arp 6916d41fe6 HDFS-7159. Use block storage policy to set lazy persist preference. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockStoragePolicySuite.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFileAttributes.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FSImageFormatPBSnapshot.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
 2014-10-17 13:42:03 -07:00
arp e4ef0023b8 HDFS-7079. Few more unit test fixes for HDFS-6581. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 13:42:02 -07:00
arp 5f86ce7ea9 HDFS-7064. Fix unit test failures in HDFS-6581 branch. (Contributed by Xiaoyu Yao) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 13:42:02 -07:00
arp 08cc08adb3 HDFS-6928. 'hdfs put' command should accept lazyPersist flag for testing. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 13:42:01 -07:00
Ravi Prakash a85767f376 HADOOP-11182. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak) Fix CHANGES.txt 2014-10-16 16:53:38 -07:00
Ravi Prakash 08eeb3e5b6 HADOOP-11181. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak) 
(cherry picked from commit 466f08792f)
 2014-10-15 15:52:46 -07:00
Zhijie Shen bec165e163 YARN-2656. Made RM web services authentication filter support proxy user. Contributed by Varun Vasudev and Zhijie Shen. 
(cherry picked from commit 1220bb72d4)
 2014-10-14 21:56:44 -07:00
Zhijie Shen 8aeda20b25 HADOOP-11181. Generalized o.a.h.s.t.d.DelegationTokenManager to handle all sub-classes of AbstractDelegationTokenIdentifier. Contributed by Zhijie Shen. 
(cherry picked from commit cdce88376a)
 2014-10-14 11:37:28 -07:00
Haohui Mai 262fef119e HADOOP-11198. Fix typo in javadoc for FileSystem#listStatus(). Contributed by Li Lu. 2014-10-13 20:43:17 -07:00
Aaron T. Myers f3132eee10 HADOOP-11176. KMSClientProvider authentication fails when both currentUgi and loginUgi are a proxied user. Contributed by Arun Suresh. 
(cherry picked from commit 0e57aa3bf6)
 2014-10-13 18:10:23 -07:00
Karthik Kambatla 88455173e8 YARN-2566. DefaultContainerExecutor should pick a working directory randomly. (Zhihai Xu via kasha) 
(cherry picked from commit cc93e7e683)
 2014-10-13 16:32:42 -07:00
Haohui Mai 16710758f1 HADOOP-11193. Fix uninitialized variables in NativeIO.c. Contributed by Xiaoyu Yao. 2014-10-10 23:02:41 -07:00
Haohui Mai f11c8eb096 HDFS-6252. Phase out the old web UI in HDFS. Contributed by Haohui Mai. 2014-10-10 17:10:54 -07:00
Andrew Wang 217c0405d9 HDFS-7209. Populate EDEK cache when creating encryption zone. (Yi Liu via wang) 
(cherry picked from commit d3d3d47202)
 2014-10-10 13:40:53 -07:00
Colin Patrick Mccabe 4c0bc45978 HDFS-7198. Fix "unchecked conversion" warning in DFSClient#getPathTraceScope (cmccabe) 
(cherry picked from commit 1ceb326933)
 2014-10-10 13:04:16 -07:00
Aaron T. Myers 8cbacb37e9 HDFS-7026. Introduce a string constant for "Failed to obtain user group info...". Contributed by Yongjun Zhang. 
(cherry picked from commit cbd21fd13b)
 2014-10-09 18:53:03 -07:00
Colin Patrick Mccabe 8addbe2b8e HADOOP-11184. Update Hadoop's lz4 to r123 (cmccabe) 
(cherry picked from commit d8d628d1e0)
 2014-10-09 17:12:24 -07:00
Andrew Wang 6cc8ec980c HADOOP-11174. Delegation token for KMS should only be got once if it already exists. (Yi Liu via wang) 
(cherry picked from commit 8d94114495)
 2014-10-09 13:21:32 -07:00
Andrew Wang 971eb31d28 HADOOP-11178. Fix findbugs exclude file. (Arun Suresh via wang) 
(cherry picked from commit d7b647f0ee)
 2014-10-09 11:58:51 -07:00
cnauroth 4e544c84e9 HDFS-7195. Update user doc of secure mode about Datanodes don't require root or jsvc. Contributed by Chris Nauroth. 2014-10-09 11:55:59 -07:00
cnauroth 5af4c021cc HADOOP-11175. Fix several issues of hadoop security configuration in user doc. Contributed by Yi Liu. 
(cherry picked from commit 1123a06e36)
 2014-10-09 11:11:13 -07:00
Uma Maheswara Rao G 7d63b4f273 HADOOP-11133. Should trim the content of keystore password file for JavaKeyStoreProvider (Yi Liu via umamahesh) 
(cherry picked from commit 8d7c54967d)
 2014-10-09 20:20:27 +05:30
Aaron T. Myers afaadd6535 HADOOP-11161. Expose close method in KeyProvider to give clients of Provider implementations a hook to release resources. Contribued by Arun Suresh. 
(cherry picked from commit d9556e873ef4d3e68c4f0c991f856d1faa747f07)
 2014-10-08 18:02:00 -07:00
Colin Patrick Mccabe f1feaae1dd HDFS-7202. Should be able to omit package name of SpanReceiver on "hadoop trace -add" (iwasakims via cmccabe) 
(cherry picked from commit d996235285)
 2014-10-08 18:01:22 -07:00
Zhijie Shen f27a88562e HADOOP-11179. Java untar should handle the case that the file entry comes without its parent directory entry. Contributed by Craig Welch. 
(cherry picked from commit a169051931)
 2014-10-08 15:37:57 -07:00
Colin Patrick Mccabe 19c307f36a CHANGES.txt: move HADOOP-10404 underneath branch 2.6 2014-10-08 14:01:50 -07:00
Andrew Wang d9aa0f8333 HADOOP-11166. Remove ulimit from test-patch.sh. 
(cherry picked from commit 60f0f6fcde)
 2014-10-07 17:30:16 -07:00
Andrew Wang 6546c59745 Fixup for CHANGES.txt 
(cherry picked from commit 0263656247)
 2014-10-07 14:59:17 -07:00
Andrew Wang 52c8ac90ea HADOOP-11172. Improve error message in Shell#runCommand on OutOfMemoryError. (Yongjun Zhang via wang) 
(cherry picked from commit 4b2834898c)
 2014-10-07 14:57:09 -07:00
Andrew Wang 3e897da5fc HADOOP-11169. Fix DelegationTokenAuthenticatedURL to pass the connection Configurator to the authenticator. (Arun Suresh via wang) 
(cherry picked from commit b2f6197523)
 2014-10-07 14:47:14 -07:00
Kihwal Lee 7910c6d035 HADOOP-11007. Reinstate building of ant tasks support. Contributed by 
Jason Lowe.
(cherry picked from commit 99d7a452be)
 2014-10-07 16:23:52 -05:00
Colin Patrick Mccabe 2a8f824fb7 HDFS-7186. Document the "hadoop trace" command. (Masatake Iwasaki via Colin P. McCabe) 
(cherry picked from commit 9196db9a08)
 2014-10-07 11:57:09 -07:00
Haohui Mai 70c8cb5614 HADOOP-11168. Remove duplicated entry dfs.webhdfs.enabled in the user doc. Contributed by Yi Liu. 2014-10-06 22:07:29 -06:00
Colin Patrick Mccabe b5158c8d24 HADOOP-10404. Commit correct version of patch (cmccabe) 
(cherry picked from commit 687d83c9e1)
 2014-10-06 14:45:04 -07:00
Colin Patrick Mccabe c97134d054 HADOOP-10404. Some accesses to DomainSocketWatcher#closed are not protected by the lock (cmccabe) 
(cherry picked from commit 8099de259f)
 2014-10-06 14:41:14 -07:00
Arun C. Murthy c5828c624f HADOOP-10731. Sync-ing CHANGES.txt across branches. 2014-10-05 07:51:27 -07:00
Arun C. Murthy 7dd508b880 HADOOP-10681. Remove unnecessary synchronization from Snappy & Zlib codecs. Contributed by Gopal Vijayaraghavan. 
(cherry picked from commit 8f9ab998e2)
 2014-10-05 07:42:10 -07:00
cnauroth 1329d1e701 HADOOP-11163. Correct CHANGES.txt. 
(cherry picked from commit bbb3b1acc0)
 2014-10-03 21:07:40 -07:00
cnauroth a828ef15b0 HADOOP-11163. MetricsSystemImpl may miss a registered source. Contributed by Chuan Liu. 
(cherry picked from commit 69c9af9103)
 2014-10-03 21:05:05 -07:00
Colin Patrick Mccabe b335df9a9b HDFS-7055. Add tracing to DFSInputStream (cmccabe) 
(cherry picked from commit 7f6ed7fe36)
 2014-10-03 13:38:15 -07:00
Andrew Wang 9ebff016c2 HADOOP-11151. Automatically refresh auth token and retry on auth failure. Contributed by Arun Suresh. 
(cherry picked from commit 2d8e6e2c4a)
 2014-10-02 19:59:56 -07:00
Haohui Mai ebeb9da80c HADOOP-11160. Fix typo in nfs3 server duplicate entry reporting. Contributed by Charles Lamb. 2014-10-02 14:08:01 -07:00
Andrew Wang 6dbba19469 HDFS-7181. Remove incorrect precondition check on key length in FileEncryptionInfo. (wang) 
(cherry picked from commit 6ac10516e7)
 2014-10-02 13:54:56 -07:00
Vinod Kumar Vavilapalli 64bed0460e YARN-1063. Augmented Hadoop common winutils to have the ability to create containers as domain users. Contributed by Remus Rusanu. 
Committed as a YARN patch even though all the code changes are in common.

(cherry picked from commit 5ca97f1e60)
 2014-10-01 09:55:57 -07:00
Steve Loughran 49be85005e HADOOP-11117 UGI HadoopLoginModule doesn't catch & wrap all kerberos-related exceptions (stevel) 2014-09-30 17:28:56 -07:00
Andrew Wang 489b4008df HADOOP-11113. Namenode not able to reconnect to KMS after KMS restart. (Arun Suresh via wang) 
(cherry picked from commit e25a25c5343c889d8c9e45b65082ddb55cf36d52)
 2014-09-30 16:48:17 -07:00
Andrew Wang d4c5a39270 HADOOP-11156. DelegateToFileSystem should implement getFsStatus(final Path f). Contributed by Zhihai Xu. 
(cherry picked from commit d7075ada5d)
 2014-09-30 16:40:00 -07:00
Arun C. Murthy 6a60fa279a Preparing to branch hadoop-2.6 2014-09-30 10:37:03 -07:00
cnauroth 57b145c3ab HADOOP-11145. TestFairCallQueue fails. Contributed by Akira AJISAKA. 
(cherry picked from commit b9158697a4)
 2014-09-30 08:58:39 -07:00
cnauroth 781833f553 HADOOP-11154. Update BUILDING.txt to state that CMake 3.0 or newer is required on Mac. Contributed by Chris Nauroth. 
(cherry picked from commit 8dc4e9408f)
 2014-09-30 08:35:35 -07:00
Brandon Li aa3d6d374d HADOOP-11130. NFS updateMaps OS check is reversed. Contributed by Brandon Li 
(cherry picked from commit c88c6c57aa)
 2014-09-29 15:08:19 -07:00
Andrew Wang 758fb8465a HADOOP-11153. Make number of KMS threads configurable. (wang) 
(cherry picked from commit 64aef18965)
 2014-09-29 15:04:26 -07:00
Andrew Wang 47ddaee1db HDFS-7122. Use of ThreadLocal<Random> results in poor block placement. (wang) 
(cherry picked from commit d7086c563ff2847c415913ac625b2a557eeccbdd)
 2014-09-29 15:00:28 -07:00
Andrew Wang d551a95fc4 Move HDFS-7157 to HDFS CHANGES.txt 
(cherry picked from commit a45b331cc9)
 2014-09-29 13:17:28 -07:00
Andrew Wang 2028414ebe HADOOP-11110. JavaKeystoreProvider should not report a key as created if it was not flushed to the backing file. (Arun Suresh via wang) 
(cherry picked from commit a78953c974)
 2014-09-29 13:10:35 -07:00
Colin Patrick Mccabe c412652820 HDFS-7157. Using Time.now() for recording start/end time of reconfiguration tasks (Lei Xu via Colin Patrick McCabe) 
(cherry picked from commit b3d5d269a7)
 2014-09-29 11:30:32 -07:00
Jason Lowe 0cfff28f57 HADOOP-11049. javax package system class default is too broad. Contributed by Sangjin Lee 
(cherry picked from commit cf4631d7c9)
 2014-09-29 14:37:28 +00:00
Steve Loughran 7fabec3258 HADOOP-11143 NetUtils.wrapException loses inner stack trace on BindException 2014-09-27 21:06:31 +01:00
Jian He a6879b606e MAPREDUCE-6087. Fixed wrong config name of MRJobConfig#MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS. Contributed by Akira AJISAKA 
(cherry picked from commit 5f16c98ad6)
 2014-09-26 18:06:19 -07:00
Allen Wittenauer 0341c65519 HADOOP-10552. Fix usage and example at FileSystemShell.apt.vm (Kenji Kikushima via aw) 2014-09-26 14:57:20 -07:00
Allen Wittenauer f894d187ed HADOOP-10731. Remove @date JavaDoc comment in ProgramDriver class (Henry Saputra via aw) 2014-09-26 14:41:53 -07:00
Allen Wittenauer 67d6fc3f01 MAPREDUCE-5945. Update the description of GenericOptionsParser -jt option (Akira AJISAKA via aw) 2014-09-26 14:26:36 -07:00
Jason Lowe 50a5227dad HADOOP-11048. user/custom LogManager fails to load if the client classloader is enabled. Contributed by Sangjin Lee 
(cherry picked from commit f154ebe8c4)
 2014-09-26 19:51:18 +00:00
Allen Wittenauer 27f9edceed HADOOP-10954. Adding site documents of hadoop-tools (Masatake Iwasaki via aw) 2014-09-26 12:01:41 -07:00
Allen Wittenauer 424b1f6955 HADOOP-8808. Update FsShell documentation to mention deprecation of some of the commands, and mention alternatives (Akira AJISAKA via aw) 2014-09-26 11:11:30 -07:00
Colin Patrick Mccabe b5b4cb4d64 HDFS-6956. Allow dynamically changing the tracing level in Hadoop servers (cmccabe) 
(cherry picked from commit 55302ccfba)
 2014-09-26 10:34:42 -07:00
Andrew Wang 0eaa4ba026 HADOOP-11140. hadoop-aws only need test-scoped dependency on hadoop-common's tests jar. Contributed by Juan Yu. 
(cherry picked from commit 4ea77efa3a)
 2014-09-25 21:56:35 -07:00
Andrew Wang 3f71a15813 HDFS-7077. Separate CipherSuite from crypto protocol version. (wang) 
(cherry picked from commit e96ce6f3e3)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 2014-09-25 18:42:17 -07:00
Tsz-Wo Nicholas Sze 022474c807 Merge branch 'HDFS-6584' into trunk 
Conflicts:
	hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicyConsiderLoad.java
 2014-09-26 04:47:25 +08:00
Colin Patrick Mccabe cb9283549f HDFS-6808. Add command line option to ask DataNode reload configuration. (Lei Xu via Colin McCabe) 
(cherry picked from commit 1861b32eb5)
 2014-09-25 13:22:35 -07:00
Vinayakumar B 1e097ba429 HADOOP-11101. How about inputstream close statement from catch block to finally block in FileContext#copy() ( Contributed by skrho ) 
(cherry picked from commit dff95f7af8)
 2014-09-25 12:47:41 +05:30
Allen Wittenauer ea1fb1461a HADOOP-11009. Add Timestamp Preservation to DistCp (Gary Steelman via aw) 2014-09-24 15:39:55 -07:00
cnauroth 6e5194099c HADOOP-11064. UnsatisifedLinkError with hadoop 2.4 JARs on hadoop-2.6 due to NativeCRC32 method changes. Contributed by Chris Nauroth. 
(cherry picked from commit cbf0ae742a)
 2014-09-24 15:33:18 -07:00
Andrew Wang 3cf28210ec HDFS-6987. Move CipherSuite xattr information up to the encryption zone root. (Zhe Zhang via wang) 2014-09-24 12:11:45 -07:00
Karthik Kambatla b34858c1f8 HADOOP-11017. Addendum to fix RM HA. KMS delegation token secret manager should be able to use zookeeper as store. (Arun Suresh via kasha) 
(cherry picked from commit ef784a2e08)
 2014-09-23 17:08:23 -07:00
Steve Loughran 273fb3a78c HADOOP-11111 MiniKDC to use locale EN_US for case conversions: hadoop-common/CHANGES.TXT 2014-09-23 10:56:55 +01:00
Vinayakumar B 1fe3086bdb HADOOP-10131. NetWorkTopology#countNumOfAvailableNodes() is returning wrong value if excluded nodes passed are not part of the cluster tree (Contributed by Vinayakumar B) 
(cherry picked from commit eab15af12c)
 2014-09-22 11:29:04 +05:30
Alejandro Abdelnur 897ced1a20 HADOOP-11017. KMS delegation token secret manager should be able to use zookeeper as store. (asuresh via tucu) 
(cherry picked from commit db890eef32)

Conflicts:
	hadoop-project/pom.xml
 2014-09-20 08:24:34 -07:00
cnauroth cadba3067f HDFS-7073. Allow falling back to a non-SASL connection on DataTransferProtocol in several edge cases. Contributed by Chris Nauroth. 
(cherry picked from commit f85cc14eb4)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java
 2014-09-19 22:04:13 -07:00
Andrew Wang eec927f3fc HADOOP-11112. TestKMSWithZK does not use KEY_PROVIDER_URI. (tucu via wang) 
(cherry picked from commit b6ceef90e5)
 2014-09-19 17:42:11 -07:00
Andrew Wang ee508c1b32 HADOOP-10970. Cleanup KMS configuration keys. (wang) 
(cherry picked from commit adf0b67a71)
 2014-09-19 15:03:26 -07:00
Allen Wittenauer 5f6129feb4 HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw) 2014-09-19 11:32:00 -07:00
Andrew Wang 58d9cc0914 HDFS-6840. Clients are always sent to the same datanode when read is off rack. (wang) 
(cherry picked from commit 8e73084491)
 2014-09-18 18:14:10 -07:00
Aaron T. Myers 71e6a4a735 HADOOP-11109. Site build is broken. Contributed by Jian He. 
(cherry picked from commit 0e2b64f2029cabbbf05a132625244427f8bf9518)
 2014-09-18 18:00:07 -07:00
Alejandro Abdelnur 22f4ef4fa9 KMS: Support for multiple Kerberos principals. (tucu) 
(cherry picked from commit fad4cd85b3)
 2014-09-18 16:04:18 -07:00
cnauroth 039f56e739 HADOOP-11105. Update CHANGES.txt. 
(cherry picked from commit 1b4b46004a)
 2014-09-18 15:41:57 -07:00
cnauroth bf26b9be39 HADOOP-11105. MetricsSystemImpl could leak memory in registered callbacks. Contributed by Chuan Liu. 
(cherry picked from commit 1942364ef1)
 2014-09-18 15:38:38 -07:00
Andrew Wang 5bc71071d1 HADOOP-11106. Document considerations of HAR and Encryption. (clamb via wang) 
(cherry picked from commit fe2f54d4cb)
 2014-09-18 14:51:27 -07:00
Andrew Wang b05da10d0d Move some HDFS JIRAs to the correct CHANGES.txt 2014-09-17 18:08:24 -07:00
Andrew Wang a3aab30d6f HADOOP-11040. Return value of read(ByteBuffer buf) in CryptoInputStream is incorrect in some cases. (Yi Liu via wang) 
(cherry picked from commit 47e5e19831)
 2014-09-17 18:03:06 -07:00
Alejandro Abdelnur d3efebf4aa HADOOP-11016. KMS should support signing cookies with zookeeper secret manager. (tucu) 
(cherry picked from commit 123f20d42f)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2014-09-17 15:30:56 -07:00
Colin Patrick Mccabe 0ad613c369 HDFS-7075. hadoop-fuse-dfs fails because it cannot find JavaKeyStoreProvider$Factory. (cmccabe) 
(cherry picked from commit f230248525)
 2014-09-17 14:28:05 -07:00
Colin Patrick Mccabe 6cb8ed0d22 HDFS-6843. Create FileStatus isEncrypted() method (clamb via cmccabe) 
(cherry picked from commit e3803d002c)
 2014-09-17 13:36:41 -07:00
Alejandro Abdelnur 6857c291af HADOOP-11099. KMS return HTTP UNAUTHORIZED 401 on ACL failure. (tucu) 
(cherry picked from commit e4ddb6da15)
 2014-09-17 11:08:25 -07:00
Alejandro Abdelnur 1c847fdd61 HADOOP-11062. CryptoCodec testcases requiring OpenSSL should be run only if -Pnative is used. (asuresh via tucu) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/pom.xml
 2014-09-16 23:37:21 -07:00
Alejandro Abdelnur 75bd79231c HADOOP-11097. kms docs say proxyusers, not proxyuser for config params. (clamb via tucu) 2014-09-16 23:21:17 -07:00
Alejandro Abdelnur 94a1e68aa5 HADOOP-11096. KMS: KeyAuthorizationKeyProvider should verify the keyversion belongs to the keyname on decrypt. (tucu) 2014-09-16 23:21:17 -07:00
Andrew Wang aeac86bc8a HADOOP-10922. User documentation for CredentialShell. Contributed by Larry McCay. 
(cherry picked from commit b6d3230e41)
 2014-09-16 17:15:37 -07:00
Alejandro Abdelnur e59f6771e8 HADOOP-10868. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu) 2014-09-15 17:10:43 -07:00
Colin Patrick Mccabe f80b10e1e7 HADOOP-11091. Eliminate old configuration parameter names from s3a (dsw via cmccabe) 
(cherry picked from commit 0ac760a58d)
 2014-09-15 16:50:10 -07:00
Colin Patrick Mccabe b4d9aca066 HDFS-6912. SharedFileDescriptorFactory should not allocate sparse files (cmccabe) 
(cherry picked from commit 8008f0e819)
 2014-09-15 14:51:59 -07:00
Kihwal Lee e6e31fbbba HDFS-7059. HAadmin transtionToActive with forceActive option can show 
confusing message. Contributed by Rushabh Shah.
(cherry picked from commit 2f847b3357)
 2014-09-15 16:30:22 -05:00
Jian He 1c3f837835 YARN-2529. Generic history service RPC interface doesn't work when service authorization is enabled. Contributed by Zhijie Shen 
(cherry picked from commit 88e329fdfb)
 2014-09-15 13:15:07 -07:00
Aaron T. Myers a0c54aeb00 HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang. 2014-09-15 08:30:42 -07:00
cnauroth 5afc3f1dad HADOOP-11088. Unittest TestKeyShell, TestCredShell and TestKMS assume UNIX path separator for JECKS key store path. Contributed by Xiaoyu Yao. 
(cherry picked from commit 957414d4cb)
 2014-09-12 14:50:37 -07:00
Karthik Kambatla d22cd065ed Update CHANGES.txt to set the release date for 2.5.1 
(cherry picked from commit 17ffbe0864)
 2014-09-11 17:36:06 -07:00
Colin Patrick Mccabe 5e4cb3d04c HADOOP-11074. Move s3-related FS connector code to hadoop-aws. (David S. Wang via Colin Patrick McCabe) 
(cherry picked from commit 5ec7fcd9dd)
 2014-09-11 15:00:47 -07:00
Alejandro Abdelnur 2924de58ce HADOOP-11083. After refactoring of HTTP proxyuser to common, doAs param is case sensitive. (tucu) 2014-09-11 13:54:59 -07:00
Jason Lowe b4ab7aa110 HADOOP-11085. Excessive logging by org.apache.hadoop.util.Progress when value is NaN. Contributed by Mit Desai 
(cherry picked from commit 581176cdc8)
 2014-09-11 19:54:05 +00:00
Steve Loughran fb804ed46c HADOOP-10373 create tools/hadoop-amazon for aws/EMR support (stevel) 
(cherry picked from commit 59384dfb71)
 2014-09-11 11:43:52 -07:00
Steve Loughran 731de8ec45 HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations for Unit testing. Hari 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1479985 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit fa56ccfd53)
 2014-09-11 11:27:12 -07:00
Alejandro Abdelnur 88e5549d90 HADOOP-10758. KMS: add ACLs on per key basis. (tucu) 2014-09-10 14:27:22 -07:00
Alejandro Abdelnur e42b889bdb HADOOP-9989. Bug introduced in HADOOP-9374, which parses the -tokenCacheFile as binary file but set it to the configuration as JSON file. (zxu via tucu) 2014-09-09 22:20:49 -07:00
Alejandro Abdelnur d0e2116502 HADOOP-11077. NPE if hosts not specified in ProxyUsers. (gchanan via tucu) 2014-09-09 22:20:43 -07:00
cnauroth 7d9c45f778 HADOOP-11057. checknative command to probe for winutils.exe on windows. Contributed by Xiaoyu Yao. 
(cherry picked from commit 6dae4b430c)
 2014-09-09 21:39:11 -07:00
cnauroth ba44099f8e HADOOP-10925. Change attribution in CHANGES.txt from trunk to 2.6.0. 
(cherry picked from commit 3e8f353c8e)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2014-09-09 14:17:44 -07:00
Chris Nauroth b601e69d9d HADOOP-10925 Compilation fails in native link0 function on Windows. 2014-09-09 16:25:14 +01:00
Colin McCabe da118bb113 HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615223 13f79535-47bb-0310-9956-ffa450edef68

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
 2014-09-08 22:00:51 -07:00
Alejandro Abdelnur d510cefd14 HADOOP-11071. KMSClientProvider should drain the local generated EEK cache on key rollover. (tucu) 2014-09-08 11:32:20 -07:00
cnauroth 17b44f11f8 Credential Provider related Unit Test Failure on Windows. Contributed by Xiaoyu Yao. 
(cherry picked from commit 302d9a0a0d)
 2014-09-08 09:31:32 -07:00
Alejandro Abdelnur 8bf2a0de69 HADOOP-11069. KMSClientProvider should use getAuthenticationMethod() to determine if in proxyuser mode or not. (tucu) 2014-09-05 22:01:13 -07:00
Alejandro Abdelnur e98c244730 HADOOP-11070. Create MiniKMS for testing. (tucu) 2014-09-05 22:01:06 -07:00
Karthik Kambatla e392229676 HADOOP-11065. Rat check should exclude **/build/**. (kasha) 
(cherry picked from commit 0571b4561b)
 2014-09-05 13:10:12 -07:00
arp 27c53a1d67 HADOOP-11067 [HDFS-6998]. Fix CHANGES.txt 2014-09-05 11:18:30 -07:00
arp 624e793ad6 HDFS-6998. warning message 'ssl.client.truststore.location has not been set' gets printed for hftp command. (Contributed by Xiaoyu Yao) 2014-09-05 11:14:24 -07:00
cnauroth c035365338 HADOOP-11063. KMS cannot deploy on Windows, because class names are too long. Contributed by Chris Nauroth. 
(cherry picked from commit b44b2ee4ad)
 2014-09-04 12:09:34 -07:00
Alejandro Abdelnur 2267ba1af7 HADOOP-11060. Create a CryptoCodec test that verifies interoperability between the JCE and OpenSSL implementations. (hitliuyi via tucu) 2014-09-04 09:22:10 -07:00
Alejandro Abdelnur dc2e38780b HADOOP-11015. Http server/client utils to propagate and recreate Exceptions from server to client. (tucu) 2014-09-04 09:14:07 -07:00
Alejandro Abdelnur dd55461cda HADOOP-11054. Add a KeyProvider instantiation based on a URI. (tucu) 2014-09-04 09:14:02 -07:00
Colin Patrick Mccabe 7b287d5ba6 HADOOP-11056. OsSecureRandom.setConf() might leak file descriptors. Contributed by Yongjun Zhang. 
(cherry picked from commit 8f1a668575)
 2014-09-03 19:39:37 -07:00
Alejandro Abdelnur a7d8ede309 HADOOP-10863. KMS should have a blacklist for decrypting EEKs. (asuresh via tucu) 
Conflicts:
	hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
 2014-09-03 15:20:28 -07:00
Karthik Kambatla 9855e884cb HADOOP-10956. Fix create-release script to include docs and necessary txt files. (kasha) 
(cherry picked from commit ce0462129f)
 2014-09-03 09:39:32 -07:00
Andrew Wang 9daf035fbc HDFS-6954. With crypto, no native lib systems are too verbose. Contributed by Charles Lamb. 
(cherry picked from commit a0ccf83dfd)
 2014-09-02 14:22:46 -07:00
Steve Loughran c50371c8b5 Fix hadoop-common-project/hadoop-common/src/main/native/README to current mail list and URL 2014-09-02 20:28:11 +01:00
Brandon Li ee3e812605 HADOOP-10990. Add missed NFSv3 request and response classes. Contributed by Brandon Li 
(cherry picked from commit bad5f38d47)
 2014-09-02 11:29:35 -07:00
Jason Lowe 0a582c77ef HADOOP-11012. hadoop fs -text of zero-length file causes EOFException. Contributed by Eric Payne 
(cherry picked from commit 01e8f056d9)
 2014-09-02 18:25:03 +00:00
Allen Wittenauer a96696bdc3 HADOOP-11036. Add build directory to .gitignore (Tsuyoshi OZAWA via aw) 
(cherry picked from commit e1109fb656)
 2014-09-02 10:12:09 -07:00
Benoy Antony 39352a7a82 HADOOP-10833. Remove unused cache in UserProvider. (Benoy Antony) 
(cherry picked from commit 258c7d0f53)
 2014-08-30 13:08:04 -07:00
Karthik Kambatla 05ae7983c6 HADOOP-11030. Define a variable jackson.version instead of using constant at multiple places. (Juan Yu via kasha) 
(cherry picked from commit 9ad413b19d)
 2014-08-29 15:57:29 -07:00
Andrew Wang 21bb77f997 Add CHANGES.txt for HADOOP-11021. 
(cherry picked from commit 93010faf10)
 2014-08-29 14:56:15 -07:00
Alejandro Abdelnur 5889f4d5f3 HADOOP-10994. KeyProviderCryptoExtension should use CryptoCodec for generation/decryption of keys. (tucu) 2014-08-29 14:22:15 -07:00
Alejandro Abdelnur 09a0ad328f HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest 6.x version. (rkanter via tucu) 
(cherry picked from commit 189abddf0b68ab43978dacaf3a9bf6ee7169cf78)
 2014-08-29 11:53:13 -07:00
Alejandro Abdelnur 54202383a9 HADOOP-10911. hadoop.auth cookie after HADOOP-10710 still not proper according to RFC2109. (gchanan via tucu) 
(cherry picked from commit 6040810df82669f140033d3c6366892640798671)

Conflicts:
	hadoop-project/pom.xml
 2014-08-29 11:23:14 -07:00
Andrew Wang 7cdb619cc5 HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. Contributed by Lei Xu. 
(cherry picked from commit 7119bd49c8)
 2014-08-28 17:41:43 -07:00
Todd Lipcon ed2a997f49 HDFS-6865. Byte array native checksumming on client side. Contributed by James Thomas. 
(cherry picked from commit ab638e77b8)
 2014-08-28 16:49:32 -07:00
Alejandro Abdelnur 1a65717ffa Removing CHANGES-fs-encryption.txt files 2014-08-28 15:13:24 -07:00
Alejandro Abdelnur 5c37f02e27 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-08-28 15:05:07 -07:00
Alejandro Abdelnur c77bd85b62 HDFS-6134 and HADOOP-10150 subtasks. 2014-08-28 15:03:08 -07:00
Suresh Srinivas 631dea88d8 HADOOP-8815. RandomDatum needs to override hashCode(). Contributed by Brandon Li. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1389661 13f79535-47bb-0310-9956-ffa450edef68

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

(cherry picked from commit 3ede27f4557c9e90430a7a3f385b8be243e89688)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2014-08-28 15:02:57 -07:00
Alejandro Abdelnur b7367dc6a2 HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu) 2014-08-28 14:47:23 -07:00
Karthik Kambatla fc99a6b80d HADOOP-11001. Fix test-patch to work with the git repo. (kasha) 
(cherry picked from commit c4c9a78411)
 2014-08-27 23:13:49 -07:00
Colin Patrick Mccabe 66ba7b2e7c HADOOP-10957. The globber will sometimes erroneously return a permission denied exception when there is a non-terminal wildcard. 
(cherry picked from commit 7a16731191)
 2014-08-27 19:52:23 -07:00
Colin Patrick Mccabe f1ee8cec61 HDFS-6879. Adding tracing to Hadoop RPC. Contributed by Masatake Iwasaki. 
(cherry picked from commit 6962510f72)
 2014-08-27 14:17:29 -07:00
Colin Patrick Mccabe fdc15db2e1 HDFS-4486. Add log category for long-running DFSClient notices. Contributed by Zhe Zhang. 
(cherry picked from commit 225569ece2)
 2014-08-27 13:45:10 -07:00
Karthik Kambatla 2a3c8331fe Add a section for 2.5.1 in CHANGES.txt 
(cherry picked from commit dc154ab86d)
 2014-08-27 00:56:17 -07:00
Arpit Agarwal 33229c1299 HADOOP-10282: Merging r1619938 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619939 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 22:16:37 +00:00
Allen Wittenauer 64abf82242 HADOOP-10998. Fix bash tab completion code to work (Jim Hester via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619888 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 18:25:57 +00:00
Christopher Douglas 7ca74a025e Revert HADOOP-10759 due to aw veto 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619692 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 07:17:51 +00:00
Chris Nauroth a6f5f71a12 HADOOP-10989. Merging change r1619659 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619660 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 04:05:56 +00:00
Allen Wittenauer 20ab9d7d4a HADOOP-8896. Javadoc points to Wrong Reader and Writer classes in SequenceFile (Ray Chiang via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619633 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 23:59:48 +00:00