Commit Graph

1535 Commits

Author SHA1 Message Date
Jing Zhao 8dfe7e0aa4 HDFS-4926. Merge change r1511477 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511478 13f79535-47bb-0310-9956-ffa450edef68
2013-08-07 20:40:36 +00:00
Andrew Wang afa778b8f9 HADOOP-9817. FileSystem#globStatus and FileContext#globStatus need to work with symlinks. (Colin Patrick McCabe via Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510816 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 23:42:39 +00:00
Chris Nauroth 9541a31f1d HDFS-4905. Merging change r1510773 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510780 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 22:11:30 +00:00
Brandon Li 2a11c30441 move HDFS-4962,HDFS-5043 to the right section in hadoop-hdfs/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510663 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 19:09:19 +00:00
Suresh Srinivas 1df1391cca HDFS-5061. Merge 1510611 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510626 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 17:49:07 +00:00
Colin McCabe df120f00c1 HADOOP-9761. ViewFileSystem#rename fails when using DistributedFileSystem (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509876 13f79535-47bb-0310-9956-ffa450edef68
2013-08-02 21:47:43 +00:00
Tsz-wo Sze 65ae6f9eed svn merge -c 1509565 from trunk for HDFS-5028. LeaseRenewer throws ConcurrentModificationException when timeout.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509566 13f79535-47bb-0310-9956-ffa450edef68
2013-08-02 07:12:28 +00:00
Brandon Li d3946f980a HDFS-4962. Merging change r1501851 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509386 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 19:05:28 +00:00
Tsz-wo Sze 13748aa808 svn merge -c 1509075 from trunk for HDFS-4513. Clarify in the WebHDFS REST API that all JSON respsonses may contain additional properties.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509076 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 03:48:42 +00:00
Tsz-wo Sze e31fcf6ec5 svn merge -c 1509070 from trunk for HADOOP-9803. Add a generic type parameter to RetryInvocationHandler.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509071 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 02:23:41 +00:00
Colin McCabe 7cd77b1abf HADOOP-9758. Provide configuration option for FS/FC symlink resolution. (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509065 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 01:08:32 +00:00
Brandon Li 79936beebb HDFS-5043. Merging r1508694 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508729 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 05:24:28 +00:00
Arun Murthy e65416a459 Updating release date for hadoop-2.1.0-beta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508408 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 12:25:13 +00:00
Suresh Srinivas 9cec392a45 HDFS-5025. Merge 1508332 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508335 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 07:56:23 +00:00
Aaron Myers 01089216e7 HDFS-5027. On startup, DN should scan volumes in parallel. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508166 13f79535-47bb-0310-9956-ffa450edef68
2013-07-29 18:30:47 +00:00
Tsz-wo Sze 3c08e71316 svn merge -c 1507259 from trunk for HADOOP-9756. Remove the deprecated getServer(..) methods from RPC.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507586 13f79535-47bb-0310-9956-ffa450edef68
2013-07-27 07:01:51 +00:00
Tsz-wo Sze e20cd46dea HDFS-3880. Use Builder to build RPC server in HDFS. Contributed by Brandon Li and Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507579 13f79535-47bb-0310-9956-ffa450edef68
2013-07-27 06:23:56 +00:00
Colin McCabe f888ffbf17 HDFS-5035. getFileLinkStatus and rename do not correctly check permissions of symlinks (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507535 13f79535-47bb-0310-9956-ffa450edef68
2013-07-27 00:18:30 +00:00
Konstantin Boudnik 709aa9b9b0 HDFS-5004. Add additional JMX bean for NameNode status data. Contributed by Trevor Lorimer.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507534 13f79535-47bb-0310-9956-ffa450edef68
2013-07-27 00:17:23 +00:00
Colin McCabe b60f3a98ba HDFS-5034. Remove debug prints from GetFileLinkInfo (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507407 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 19:21:59 +00:00
Colin McCabe 4839eca238 reverting HDFS-5034 because jenkins did not run on it
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507372 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 17:19:32 +00:00
Colin McCabe 8d86d85b22 HDFS-5034. Remove debug prints from GetFileLinkInfo (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507371 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 17:15:07 +00:00
Suresh Srinivas e3d5a147d0 HDFS-5016. Merge 1507189 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507191 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 04:47:25 +00:00
Suresh Srinivas 3bd39b2ea1 HDFS-4979. Merge 1507170 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507173 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 01:19:25 +00:00
Jing Zhao b3c61cb9ee HDFS-5024. Merge change r1506789 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506790 13f79535-47bb-0310-9956-ffa450edef68
2013-07-25 00:37:19 +00:00
Kihwal Lee 562cd12535 Fix CHANGES.txt in hdfs
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506561 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 14:02:55 +00:00
Jing Zhao 4be83f8e79 HDFS-5020. Merge change r1506421 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506424 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 07:33:50 +00:00
Colin McCabe 5ff0774e8a HDFS-4817. Make HDFS advisory caching configurable on a per-file basis. (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506188 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 17:54:44 +00:00
Suresh Srinivas f284b538fd HDFS-4974. Merge 1505911 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505912 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 06:44:47 +00:00
Suresh Srinivas 5c05d70c13 HADOOP-9760. Merge 1505875 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505876 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 01:47:09 +00:00
Jing Zhao 5758018f1b HDFS-5008. Merge change r1505761 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505764 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 18:27:55 +00:00
Colin McCabe ab17599b03 HADOOP-9435. Support building the JNI code against the IBM JVM. (Tian Hong Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505748 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 17:58:11 +00:00
Tsz-wo Sze dbf8d190d2 svn merge -c 1505610 from trunk for HADOOP-9754. Remove unnecessary "throws IOException/InterruptedException", and fix generic and other javac warnings.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505613 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 07:41:33 +00:00
Jing Zhao 9b8a60f44f HDFS-5018. Merge change r1505603 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505604 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 05:33:40 +00:00
Uma Maheswara Rao G 9293341473 Merge r1505362 from trunk. HDFS-4602. TestBookKeeperHACheckpoints fails. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505364 13f79535-47bb-0310-9956-ffa450edef68
2013-07-21 12:33:33 +00:00
Kihwal Lee e22e6725f9 svn merge -c 1505160 merging to branch-2 to fix HDFS-5010.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505161 13f79535-47bb-0310-9956-ffa450edef68
2013-07-20 16:26:06 +00:00
Harsh J f6b0fa487b HDFS-4278. Log an ERROR when DFS_BLOCK_ACCESS_TOKEN_ENABLE config is disabled but security is turned on. Contributed by Kousuke Saruta. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504790 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 07:05:57 +00:00
Jing Zhao 089b7e63e7 HDFS-5007. Merge change r1504764 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504765 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 05:46:28 +00:00
Arun Murthy 83c776c85d Set version in branch-2 to 2.3.0-SNAPSHOT to reflect that we will only be adding new content to hadoop-2.3.0 and not hadoop-2.2.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504744 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:35:34 +00:00
Arun Murthy 1f65519b8a Fixed CHANGES.txt to reflect that new content in branch-2 goes to hadoop-2.3.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504743 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:30:18 +00:00
Arun Murthy 78137a3634 Fixed CHANGES.txt to reflect that all fixes in 2.1.1-beta are now in 2.1.0-beta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504739 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:04:10 +00:00
Chris Nauroth bddf1659f8 HDFS-4996. Merging change r1504679 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504682 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 22:05:10 +00:00
Chris Nauroth f736ef62b2 HDFS-5003. Merging change r1504352 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504353 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 03:32:03 +00:00
Jing Zhao 18024e683a HDFS-5005. Merging r1504326 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504327 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 00:15:09 +00:00
Colin McCabe 2dba05af50 fix misspelling in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504230 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 18:41:53 +00:00
Kihwal Lee 17e8683dc1 svn merge -c 1503971 merging to branch-2 fix HDFS-4998.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503972 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 02:04:04 +00:00
Jason Darrell Lowe 2767f51220 svn merge -c 1503954 FIXES: HADOOP-9734. Common protobuf definitions for GetUserMappingsProtocol, RefreshAuthorizationPolicyProtocol and RefreshUserMappingsProtocol. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503955 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 00:12:05 +00:00
Kihwal Lee 91469526ce svn merge -c 1477344 to branch-2 to fix HDFS-4687.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503952 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 23:58:56 +00:00
Kihwal Lee 1642f06cd8 HDFS-4999. Fix TestShortCircuitLocalRead on branch-2. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503898 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 21:31:21 +00:00
Colin McCabe 4c45da1ab7 HDFS-4657. Limit the number of blocks logged by the NN after a block report to a configurable value. (Aaron Twinning Meyers via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503864 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 20:11:26 +00:00
Colin McCabe 62f5c14df2 HADOOP-9618. thread which detects GC pauses (Todd Lipcon via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503810 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 17:57:44 +00:00
Tsz-wo Sze 6f1452044a svn merge -c 1503720 from trunk for HDFS-4992. Make balancer's mover thread count and dispatcher thread count configurable.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503721 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 14:07:22 +00:00
Suresh Srinivas ecf57540da HDFS-4903. Merge 1503570 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503572 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 06:49:05 +00:00
Todd Lipcon ce5acc180b HDFS-4982. JournalNode should relogin from keytab before fetching logs from other JNs. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502683 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 20:44:50 +00:00
Suresh Srinivas c7bf3e4ad8 HDFS-4912. Merge 1502634 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502640 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 17:57:46 +00:00
Chris Nauroth 71a4677f6a HDFS-4374. Merging change r1502331 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502426 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 05:10:38 +00:00
Chris Nauroth 9f5667fe27 HDFS-4373. Merging change r1502328 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502423 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 04:53:17 +00:00
Chris Nauroth 5039a956ff HDFS-4372. Merging change r1502120 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502419 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 04:35:43 +00:00
Jing Zhao a52f448e21 HDFS-4978. Merge r1502400 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502402 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 00:21:10 +00:00
Colin McCabe 82ecf50a40 HADOOP-9418. Add symlink support to DistributedFileSystem (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502384 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 22:08:44 +00:00
Suresh Srinivas 674a7ce699 HDFS-4980. Missed change to CHANGES.txt from previous commit 1502308
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502311 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 18:13:59 +00:00
Suresh Srinivas def7fcb3a7 HDFS-4980. Merge 1502302 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502308 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 18:11:27 +00:00
Alejandro Abdelnur f0983d958d updating CHANGES.txt after committing MAPREDUCE-5333,HADOOP-9661,HADOOP-9355,HADOOP-9673,HADOOP-9414,HADOOP-9416,HDFS-4797,YARN-866,YARN-736,YARN-883 to 2.1-beta branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502074 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 00:21:49 +00:00
Tsz-wo Sze 2d339dd0ea In CHANGES.txt, move HDFS-4908 to 2.1.0-beta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502010 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 21:28:27 +00:00
Tsz-wo Sze 221014137b HDFS-4645. Move from randomly generated block ID to sequentially generated block ID. Contributed by Arpit Agarwal
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501993 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 21:00:57 +00:00
Alejandro Abdelnur 944401defd HDFS-4969. WebhdfsFileSystem expects non-standard WEBHDFS Json element. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501870 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 17:35:44 +00:00
Kihwal Lee 2d88e826e1 svn merge -c 1501841. Merging from trunk to branch-2 to fix HDFS-4887.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501843 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 16:42:38 +00:00
Alejandro Abdelnur 29090d45af HDFS-4951. FsShell commands using secure httpfs throw exceptions due to missing TokenRenewer. (rknater via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501452 13f79535-47bb-0310-9956-ffa450edef68
2013-07-09 18:43:43 +00:00
Alejandro Abdelnur dc18424723 HDFS-4841. FsShell commands using secure webhfds fail ClientFinalizer shutdown hook. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501006 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 23:11:03 +00:00
Konstantin Boudnik e9b658b021 HDFS-4860. Add additional attributes to JMX beans. Contributed by Trevor Lorimer
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500140 13f79535-47bb-0310-9956-ffa450edef68
2013-07-05 21:40:46 +00:00
Aaron Myers 0886f841c5 HDFS-4465. Optimize datanode ReplicasMap and ReplicaInfo. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499660 13f79535-47bb-0310-9956-ffa450edef68
2013-07-04 05:56:41 +00:00
Brandon Li d49a541d8a Move HDFS-4948 and HDFS-4762 to the right section in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499494 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 17:33:41 +00:00
Tsz-wo Sze 4bcf0eb51a HDFS-4954. In nfs, OpenFileCtx.getFlushedOffset() should handle IOException. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499321 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 11:16:15 +00:00
Brandon Li c8befb6c69 Fix build version for nfs projects in branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499224 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 06:36:58 +00:00
Brandon Li 07a08e2941 HDFS-4762,HDFS-4948. Merging change r1499029,r1499041,r1499152 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499190 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 03:55:42 +00:00
Tsz-wo Sze b189d3a968 svn merge -c 1498962 from trunk for HDFS-4943. WebHdfsFileSystem does not work when original file path has encoded chars.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498963 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 14:59:55 +00:00
Colin McCabe 3121145b9a HADOOP-9414. Refactor out FSLinkResolver and relevant helper methods.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498728 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 22:35:11 +00:00
Kihwal Lee 5683f04907 svn merge -c 1498665 Merging from trunk to branch-2 to fix HDFS-4888.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498672 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 20:32:36 +00:00
Thomas Graves 9520013838 Preparing for 0.23.9 release
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498478 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 14:27:48 +00:00
Tsz-wo Sze 797a30b5b7 svn merge -c 1498202 from trunk for HDFS-4797. BlockScanInfo does not override equals(..) and hashCode() consistently.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498203 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 01:29:28 +00:00
Chris Nauroth c141d292c3 HDFS-4944. Merging change r1498055 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498057 13f79535-47bb-0310-9956-ffa450edef68
2013-06-30 03:49:22 +00:00
Colin McCabe 7edc5f5456 HADOOP-9673. NetworkTopology: When a node cannot be added, print out its location for diagnostic purposes
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1497180 13f79535-47bb-0310-9956-ffa450edef68
2013-06-27 01:40:05 +00:00
Chris Nauroth b7e4aae320 HDFS-4932. Merging change r1497141 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1497143 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 22:24:52 +00:00
Arun Murthy de82f25604 Preparing for hadoop-2.1.0-beta release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496790 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 06:51:07 +00:00
Colin McCabe 7880da2743 HADOOP-9355. Abstract Symlink tests to use either FileContext or FileSystem (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496691 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 00:36:01 +00:00
Chris Nauroth 837288af56 HDFS-4927. Merging change r1496350 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496351 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 05:11:29 +00:00
Jason Darrell Lowe 564ee4c962 svn merge -c 1495648 FIXES: HDFS-4205. fsck fails with symlinks. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495649 13f79535-47bb-0310-9956-ffa450edef68
2013-06-22 00:48:12 +00:00
Sanjay Radia 85ea4d19a2 Merged HADOOP-9619 svn merge -c 1495564
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495573 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 20:06:24 +00:00
Brandon Li 56fe83e23f Update CHANGES.txt to move HDFS-4772 to 2.1.0 section
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495542 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 18:59:47 +00:00
Brandon Li 49b03957ba HDFS-4772. Merging change r1495253 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495535 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 18:34:05 +00:00
Konstantin Shvachko d022a56637 HDFS-4883. complete() should verify fileId. Contributed by Tao Luo.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495312 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 08:01:24 +00:00
Tsz-wo Sze 619f293bca svn merge -c 1494858 from trunk for HDFS-4908. Reduce snapshot inode memory usage.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494859 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 05:12:42 +00:00
Tsz-wo Sze 0536aec248 svn merge -c 1494854 from trunk for HDFS-4914. Use DFSClient.Conf instead of Configuration.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494855 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 04:50:24 +00:00
Suresh Srinivas c9371d3e41 HDFS-4917. Merge 1494433 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494446 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 04:08:36 +00:00
Suresh Srinivas 0128a87eca HDFS-4917. Revert r1494434 previous merge that included extraneous change.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494442 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 04:04:01 +00:00
Suresh Srinivas cd5b7bdf06 HDFS-4917. Merge 1494433 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494434 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 03:58:06 +00:00
Colin McCabe b5d2b0a121 HDFS-4461. DirectoryScanner: volume prefix takes up memory for every block that is scanned (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494403 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 00:40:22 +00:00
Aaron Myers 6feda0aa3b HDFS-4906. HDFS Output streams should not accept writes after being closed. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494304 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 21:08:37 +00:00
Chris Nauroth 7c668da943 HDFS-4818. Merging change r1494023 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494024 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 05:03:38 +00:00
Colin McCabe f32c75aeb6 HDFS-4626. ClientProtocol#getLinkTarget should throw an exception for non-symlink and non-existent paths. (Andrew Wang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493987 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 02:29:03 +00:00
Chris Nauroth 8eab891bff HDFS-4910. TestPermission failed in branch-2. Contributed by Chuan Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493932 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 20:54:34 +00:00
Jing Zhao f77fff4b40 HDFS-4875. Merging change r1493850 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493854 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 17:44:05 +00:00
Chris Nauroth 2d8999dc35 HDFS-4866. Merging change r1493300 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493301 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 04:05:48 +00:00
Colin McCabe 487b143b14 Add missing file for HDFS-3934 (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493249 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 21:14:33 +00:00
Colin McCabe 043d5fc97d HDFS-3934. duplicative dfs_hosts entries handled wrong (all files) (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493234 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 20:25:12 +00:00
Chris Nauroth 0c49c66cf3 HDFS-4783. Merging change r1493149 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493151 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 16:47:46 +00:00
Tsz-wo Sze f15b150f03 svn merge -c 1492941 from trunk for HDFS-4845. FSNamesystem.deleteInternal should acquire write-lock before changing the inode map.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492942 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 03:14:10 +00:00
Suresh Srinivas 03b03e066c HDFS-4659. Merge r1477994 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492914 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 00:21:23 +00:00
Suresh Srinivas 4091026231 HDFS-3163. Merge r1338486 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492912 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 00:16:08 +00:00
Suresh Srinivas f79b53f7d5 HDFS-3792. Merge r1372690 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492894 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 22:56:08 +00:00
Suresh Srinivas bf81643485 HDFS-3009. Merge r1293390 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492892 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 22:45:54 +00:00
Suresh Srinivas e277c2a521 HDFS-2857. Merge r1238747 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492890 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 22:39:49 +00:00
Suresh Srinivas f5fa1fdb84 HDFS-2572. Merge r1204177 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492876 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 21:34:17 +00:00
Jing Zhao d1058249fb HDFS-4902. Merging changes r1492791 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492800 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 18:23:26 +00:00
Konstantin Shvachko 2c79780045 Port HDFS-4878 to branch-0.23.9.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492452 13f79535-47bb-0310-9956-ffa450edef68
2013-06-12 22:15:34 +00:00
Chris Nauroth 7f2848ba73 HADOOP-9638. Merging change r1492297 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492314 13f79535-47bb-0310-9956-ffa450edef68
2013-06-12 18:07:31 +00:00
Tsz-wo Sze d5d1b89645 svn merge -c 1492062 from trunk for HDFS-4819. Update Snapshot doc to clarify that nested snapshots are not allowed.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492064 13f79535-47bb-0310-9956-ffa450edef68
2013-06-12 05:44:39 +00:00
Jing Zhao 443578ccf7 HDFS-4873. Merging change r1491957 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491964 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 21:16:42 +00:00
Colin McCabe 68671e453b HADOOP-9635. Fix potential stack overflow in DomainSocket.c (V. Karthik Kumar via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491943 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 20:29:06 +00:00
Konstantin Shvachko 2a05c63004 HDFS-4878. On Remove Block, block is not removed from neededReplications queue. Contributed by Tao Luo.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491672 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 01:40:52 +00:00
Suresh Srinivas 401823e1ee HDFS-4752. Merge 1491631 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491633 13f79535-47bb-0310-9956-ffa450edef68
2013-06-10 22:41:22 +00:00
Konstantin Boudnik 6e9ad986eb Setting 2.0.5-alpha release date
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491137 13f79535-47bb-0310-9956-ffa450edef68
2013-06-09 04:51:28 +00:00
Ivan Mitic b134d65389 HDFS-4677. Merging change r1491096 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491101 13f79535-47bb-0310-9956-ffa450edef68
2013-06-08 23:49:26 +00:00
Kihwal Lee 27d3a51b56 svn merge -c 1490803 Merging from trunk to branch-2 to fix HDFS-4832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490805 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 20:05:17 +00:00
Suresh Srinivas ae1c931095 HDFS-4880. Merge 1490746 fron trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490748 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 17:39:18 +00:00
Suresh Srinivas 2910b06dfa HDFS-4586. Merge r1455708 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490495 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 02:08:44 +00:00
Kihwal Lee f07af53a34 svn merge -c 1490486 Merging from trunk to branch-2 to fix HDFS-4862.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490487 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 01:18:27 +00:00
Konstantin Shvachko bbafbced87 HDFS-4867. metaSave NPEs when there are invalid blocks in repl queue. Contributed by Plamen Jeliazkov and Ravi Prakash.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490434 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 20:45:56 +00:00
Jing Zhao 3b08699b2c HDFS-4877. Merging change r1490421 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490430 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 20:29:05 +00:00
Tsz-wo Sze c2f9f05323 HDFS-4876. Fix the javadoc of FileWithSnapshot and move FileDiffList to FileWithSnapshot.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490117 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 03:35:03 +00:00
Suresh Srinivas a35a2ca335 HADOOP-8957. Merge r1420965 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490115 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 03:29:43 +00:00
Jing Zhao 5826b0c186 HDFS-4850. Merging change r1490080 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490084 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 23:42:11 +00:00
Thomas Graves ee792cf084 Updating release date for 0.23.8
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489902 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 15:01:24 +00:00
Tsz-wo Sze 267d7ca14e svn merge -c -1489709 for reverting HDFS-4876.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489875 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 13:53:12 +00:00
Tsz-wo Sze f974ce444d svn merge -c 1489708 from trunk for HDFS-4876. Fix the javadoc of FileWithSnapshot and move FileDiffList to FileWithSnapshot.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489709 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 05:27:58 +00:00
Aaron Myers 99faae2076 HDFS-4815. TestRBWBlockInvalidation: Double call countReplicas() to fetch corruptReplicas and liveReplicas is not needed. Contributed by Tian Hong Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489670 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 23:18:58 +00:00
Kihwal Lee eb0707983b svn merge -c 1489634 Merging from trunk to branch-2 to fix HDFS-4840.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489642 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 21:49:09 +00:00
Arun Murthy 27ed92a3fb Set version in branch-2 to 2.2.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489479 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 15:34:52 +00:00
Jason Darrell Lowe eb7af141e4 HADOOP-9287. Parallel-testing hadoop-common. Contributed by Andrey Klochkov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489250 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 00:29:37 +00:00
Tsz-wo Sze 6bd7b27abf svn merge -c 1431726 from trunk for HDFS-4382. Fix typo MAX_NOT_CHANGED_INTERATIONS.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488856 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 06:13:53 +00:00
Tsz-wo Sze 4519131f77 svn merge -c 1430917 from trunk for HDFS-4261. Fix bugs in Balaner causing infinite loop and TestBalancerWithNodeGroup timeing out.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488855 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 06:11:22 +00:00
Tsz-wo Sze 8dd8c00fbb svn merge -c 1416691 from trunk for HDFS-4240. For nodegroup-aware block placement, when a node is excluded, he nodes in the same nodegroup should also be excluded.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488851 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 05:50:16 +00:00
Tsz-wo Sze 9b8d329e65 svn merge -c 1417130 from trunk for HDFS-4234. Use generic code for choosing datanode in Balancer.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488850 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 05:39:04 +00:00
Tsz-wo Sze 16995501d3 Merge r1414874 and r1414878 from trunk for HDFS-3495. Update Balancer to support new NetworkTopology with NodeGroup.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488848 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 05:28:34 +00:00
Tsz-wo Sze f8bb18770b svn merge -c 1357442 from trunk for HDFS-3601. Add BlockPlacementPolicyWithNodeGroup to support block placement with 4-layer network topology.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488845 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 04:59:48 +00:00
Tsz-wo Sze 4c734a8ee8 svn merge -c 1353807 from trunk for HDFS-3498. Support replica removal in BlockPlacementPolicy and make BlockPlacementPolicyDefault extensible for reusing code in subclasses.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488844 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 04:35:04 +00:00
Tsz-wo Sze 8ecc0ba26f svn merge -c 1351445 from trunk for HADOOP-8470. Add NetworkTopologyWithNodeGroup, a 4-layer implementation of NetworkTopology.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488839 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 04:05:41 +00:00
Tsz-wo Sze 1d520009e3 svn merge -c 1347867 from trunk for HADOOP-8469. Make NetworkTopology class pluggable.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488838 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 03:57:32 +00:00
Tsz-wo Sze 332cf8faeb svn merge -c 1488630 from trunk for moving HDFS-4826 to 2.1.0-beta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488631 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 23:02:10 +00:00
Konstantin Boudnik 6e0b55c5b7 Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 2,0.5-alpha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488586 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 20:06:41 +00:00
Konstantin Boudnik 44a72a119a Adding 2.0.5-alpha release to CHANGES.txt files of branch-2
Also updating current version to 2.1.0-beta in the CHANGES.txt files

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488585 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 20:06:32 +00:00
Tsz-wo Sze 360fa0c6f5 svn merge -c 1487942 from trunk for HDFS-4848. copyFromLocal and renaming a file to ".snapshot" should output hat ".snapshot" is a reserved name.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488097 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 05:16:05 +00:00
Tsz-wo Sze 6428612f35 svn merge -c 1487698 from trunk for HDFS-4863. The root directory should be added to the snapshottable directory list while loading fsimage.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488096 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 05:13:32 +00:00
Tsz-wo Sze 74fa2f1de8 svn merge -c 1487655 from trunk for HDFS-4857. Snapshot.Root and AbstractINodeDiff#snapshotINode should not be put into INodeMap when loading FSImage.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488094 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 05:10:06 +00:00
Tsz-wo Sze 387b7af02f svn merge -c 1487647 from trunk for HDFS-4846. Clean up snapshot CLI commands output stacktrace for invalid arguments.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488093 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 05:07:52 +00:00
Tsz-wo Sze ab2588a78b svn merge -c 1487643 from trunk for HDFS-4842. Identify the correct prior snapshot when deleting a snapshot under a renamed subtree.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488091 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 05:03:27 +00:00
Tsz-wo Sze 1b594395da svn merge -c 1483150 from trunk for HDFS-4826. TestNestedSnapshots times out due to repeated slow edit log flushes when running on virtualized disk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488090 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 04:50:10 +00:00
Tsz-wo Sze 82f91de0b6 Merge r1480838 and r1480840 from trunk for merging HDFS Snapshot feature.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488089 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 04:29:20 +00:00
Alejandro Abdelnur 8bb534f423 HDFS-4865. Remove sub resource warning from httpfs log at startup time. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487619 13f79535-47bb-0310-9956-ffa450edef68
2013-05-29 19:55:32 +00:00
Devaraj Das 0c221b3b03 Merge -r 1487092:1487093 from trunk onto branch-2. Fixes HDFS-4827.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487099 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 20:25:35 +00:00
Kihwal Lee 419fb4a4de svn merge -c 1486974 Merging from trunk to branch-2 to fix HDFS-4780.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486975 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 15:49:33 +00:00
Suresh Srinivas dbe14af299 HDFS-4825. Merge change 1486386 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486387 13f79535-47bb-0310-9956-ffa450edef68
2013-05-26 02:28:10 +00:00
Suresh Srinivas fa88e4ea6e HADOOP-8562. CHANGES.txt cleanup related to merging the related jiras to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486384 13f79535-47bb-0310-9956-ffa450edef68
2013-05-26 00:09:12 +00:00
Suresh Srinivas 1a895a3fd6 HADOOP-8562. Merge r1477427 for HDFS-4610, r1477408 for YARN-506, r1477403 for MAPREDUCE-5177
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486241 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:29:49 +00:00
Suresh Srinivas baa2db4c64 HADOOP-8562. Merge r1477376 for HADOOP-9413, r1476877 for HDFS-4734, r1476856 for HADOOP-9524.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486238 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:20:55 +00:00
Suresh Srinivas 1e119f5c31 HDFS-4705. Merge r1476610 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486199 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 19:54:00 +00:00
Suresh Srinivas f05a2e5b69 HDFS-4722. Merge r1476597 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486176 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 19:16:58 +00:00
Suresh Srinivas c0fbc823f0 HDFS-4740. Merge r1476596 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486174 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 19:14:04 +00:00
Suresh Srinivas bc0eb9d993 HDFS-4743. Merge r1476591 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486162 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:45:39 +00:00
Suresh Srinivas 3694a73ff8 HADOOP-9290. Merge r1476586 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486159 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:37:58 +00:00
Suresh Srinivas 0610d2d2d3 HDFS-4741. Merge r1476585 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486151 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:29:50 +00:00
Suresh Srinivas 0af2735024 HDFS-3131. Merge r1305688 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486150 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:26:33 +00:00
Suresh Srinivas f1f11999d9 HDFS-4732. Merge r1471090 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486146 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:17:52 +00:00
Suresh Srinivas 4a16d5b759 HDFS-4725. Merge r1470771 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486144 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:15:42 +00:00
Suresh Srinivas a9176a64a1 HDFS-4693. Merge r1468457 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486098 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 15:44:33 +00:00
Suresh Srinivas 9b910c5c88 HADOOP-8562. Merge r1464780 HDFS-4625, r1465869 YARN-557, r1466148 HDFS-4674, r1466306 HADOOP-9437, r1466746 YARN-487
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485934 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 05:34:41 +00:00
Suresh Srinivas 0a96ae767f HADOOP-8562. Merge r1459586 for HDFS-4615, r1459592 for HDFS-4584, r1459643, r1459642 for HADOOP-9387, r1460086 for HADOOP-9353
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485932 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 05:12:56 +00:00
Suresh Srinivas 02205fa797 HADOOP-8562. Merge r1457069 for HDFS-4604, r1459514 for YARN-488, r1459520 for YARN-490, r1459526 for YARN-491, r1459544 for MAPREDUCE-5078 and r1459573 for HDFS-4607
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485911 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 00:51:31 +00:00
Suresh Srinivas a6c4b42353 HADOP-8662. Merge r1455637 for HADOOP-9388, r1455956 for HDFS-4593, r1456060 for HDFS-4582 and r1457057 for HDFS-4603
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485907 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 00:42:28 +00:00
Suresh Srinivas 830909a910 HADOOP-8562. Merge changes r1454616 for HDFS-4573, r1454889 for HADOOP-8973, r1455360 for HDFS-4572, r1455605 for HDFS-4287 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485892 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 22:51:30 +00:00
Kihwal Lee 7f66f9ccf6 HDFS-4714. Log short messages in Namenode RPC server for exceptions meant for clients. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485882 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 22:28:21 +00:00
Kihwal Lee 3f9b3d49a3 svn merge -c 1485861 Merging from trunk to branch-2 to fix HDFS-4807.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485863 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 21:37:32 +00:00
Suresh Srinivas 7ba49c56aa Merge changes r1453645 for HADOOP-9373, r1453675 for HADOOP-9376, r1453676 for HADOOP-9365, r1454108 for HADOOP-9364.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485853 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 21:17:38 +00:00
Suresh Srinivas 3eb800f539 HADOOP-9373. Merge change r1453599 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485850 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 21:07:05 +00:00
Suresh Srinivas a1235b5ba9 HADOOP-8562. Merge r1453486 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485845 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 20:41:53 +00:00
Aaron Myers e30e5becc2 HDFS-4298. StorageRetentionManager spews warnings when used with QJM. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485375 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 19:42:52 +00:00
Vinod Kumar Vavilapalli f71593ae2c MAPREDUCE-5156. Change hadoop examples ProgramDriver to be able to run 1.x examples jar on top of YARN. This change breaks 0.23.x direct usages of ProgramDriver. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1485085 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485086 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 06:37:01 +00:00
Kihwal Lee 623be287b7 HDFS-3875. Issue handling checksum errors in write pipeline. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484809 13f79535-47bb-0310-9956-ffa450edef68
2013-05-21 13:45:14 +00:00
Todd Lipcon 5fc2beed58 HDFS-4824. FileInputStreamCache.close leaves dangling reference to FileInputStreamCache.cacheCleaner. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483642 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 03:39:22 +00:00
Aaron Myers 815f2d7236 HDFS-4830. Typo in config settings for AvailableSpaceVolumeChoosingPolicy in hdfs-default.xml. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483604 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 23:23:48 +00:00
Aaron Myers 4069886102 HDFS-4787. Create a new HdfsConfiguration before each TestDFSClientRetries testcases. Contributed by Tian Hong Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483238 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 08:16:07 +00:00
Todd Lipcon f0c2f42b38 Add HDFS-347 and related JIRAs to CHANGES.txt under 2.0.5
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483213 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 07:10:46 +00:00
Todd Lipcon ba594d810e HDFS-4698. Provide client-side metrics for remote reads, local reads, and short-circuit reads. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483211 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 07:05:45 +00:00
Todd Lipcon e3021894e7 HDFS-4661. A few little code cleanups of some HDFS-347-related code. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483210 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 07:04:12 +00:00
Todd Lipcon 87a1e92453 HDFS-347. DFS read performance suboptimal when client co-located on nodes with data. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483209 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 07:02:57 +00:00
Tsz-wo Sze bfd2074a57 svn merge -c 1482661 from trunk for HDFS-3180. Add socket timeouts to WebHdfsFileSystem.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482662 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 02:31:48 +00:00
Tsz-wo Sze 9ec6c9e018 svn merge -c 1482658 from trunk for HDFS-4813. Add volatile to BlocksMap.blocks so that the replication thread can see the updated value.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482659 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 02:19:24 +00:00
Kihwal Lee 3d615b6573 svn merge -c 1482121. Merging from trunk to branch-2 to fix HDFS-4805.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482122 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 22:06:55 +00:00
Aaron Myers 9c512f83d8 HDFS-4765. Permission check of symlink deletion incorrectly throws UnresolvedLinkException. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482013 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 18:13:44 +00:00
Aaron Myers 82c75115da HDFS-4300. TransferFsImage.downloadEditsToStorage should use a tmp file for destination. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481996 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 18:00:33 +00:00
Suresh Srinivas 2482e3270f HDFS-4533. Merge 1481178 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481211 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 21:54:27 +00:00
Aaron Myers f8b466a1f8 HADOOP-9485. No default value in the code for hadoop.rpc.socket.factory.class.default. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481208 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 21:49:58 +00:00
Aaron Myers bd816a2739 HDFS-4751. TestLeaseRenewer#testThreadName flakes. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481166 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 19:54:27 +00:00
Kihwal Lee d0ffad0387 svn merge -c 1481084. Merging from trunk to branch-2 to fix HDFS-4799.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481086 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 16:38:27 +00:00
Aaron Myers 211a9d99db HDFS-4810. several HDFS HA tests have timeouts that are too short. Contributed by Chris Nauroth
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480842 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 00:19:57 +00:00
Vinod Kumar Vavilapalli c175e3f4aa Fixing release date for 2.0.4-alpha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480482 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 22:02:00 +00:00
Devaraj Das 0effce3ff0 HDFS-2576. Fixed some compilation issues. Affects only branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480151 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 03:12:58 +00:00
Devaraj Das 1dd166d72e Merge -r 1477848:1477849 from trunk onto branch-2. Fixes HDFS-4778.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480136 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 00:12:01 +00:00
Devaraj Das 471b37704a Merge -r 1476394:1476395 from trunk onto branch-2. Fixes HDFS-2576.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480135 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 00:05:18 +00:00
Aaron Myers 20fd61951b HDFS-4804. WARN when users set the block balanced preference percent below 0.5 or above 1.0. Contributed by Stephen Chu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480099 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 21:42:14 +00:00
Suresh Srinivas bd198d7dfe HDFS-4784. Merge r1478276 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478287 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 06:56:19 +00:00
Suresh Srinivas ab8ce0fcda HDFS-4785. Merge change r1478267 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478286 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 06:48:36 +00:00
Suresh Srinivas 78eaf8c3df HDFS-4434. Merge r1469644 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478282 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 06:35:58 +00:00
Aaron Myers a9c43af739 Move the CHANGES.txt entry for HDFS-4305 to the incompatible changes section.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477489 13f79535-47bb-0310-9956-ffa450edef68
2013-04-30 07:16:22 +00:00
Aaron Myers 0d10e7a16f HDFS-4305. Add a configurable limit on number of blocks per file, and min block size. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477358 13f79535-47bb-0310-9956-ffa450edef68
2013-04-29 21:41:52 +00:00
Aaron Myers a3ecc3b910 HDFS-4733. Make HttpFS username pattern configurable. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477241 13f79535-47bb-0310-9956-ffa450edef68
2013-04-29 18:07:55 +00:00
Suresh Srinivas f76ad1af85 HDFS-4748. Merge r1476587 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476588 13f79535-47bb-0310-9956-ffa450edef68
2013-04-27 14:32:49 +00:00
Suresh Srinivas 091e5df455 HDFS-4768. Merge 1476579 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476581 13f79535-47bb-0310-9956-ffa450edef68
2013-04-27 14:11:41 +00:00
Tsz-wo Sze b2927bd936 svn merge -c 1476399 from trunk for HDFS-4721. Speed up lease recovery by avoiding stale datanodes and choosing he datanode with the most recent heartbeat as the primary.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476400 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 20:52:29 +00:00
Suresh Srinivas 14246f3d24 HDFS-4434. Reverting the merge to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475972 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 21:28:51 +00:00
Suresh Srinivas a51590e1c5 HDFS-4053. Merging change r1399908 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475848 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 16:44:59 +00:00
Suresh Srinivas e304090117 Cleanup CHANGES.txt to have consistent formatting and match the descrtion with CHANGES.txt in trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475780 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 14:04:12 +00:00
Suresh Srinivas 14f658bf38 HDFS-4745. Merge 1475623 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475625 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 04:32:51 +00:00
Aaron Myers 2838617e0a Update CHANGES.txt for HDFS-4739.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471775 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 23:32:50 +00:00
Aaron Myers a0e8dbbb19 HDFS-4739. NN can miscalculate the number of extra edit log segments to retain. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471773 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 23:32:13 +00:00
Suresh Srinivas 1efa9d84ab HDFS-4434. Merge r1469644 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471703 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 21:41:56 +00:00
Suresh Srinivas 7ca417037f HDFS-4340. Merge r1448502 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471698 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 21:35:47 +00:00
Suresh Srinivas 13df6b76d2 HDFS-4340. Merge r1443169 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471692 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 21:31:42 +00:00
Suresh Srinivas 2dbf0c2af5 HDFS-4243. Merge r1416709 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471603 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 19:21:05 +00:00
Suresh Srinivas 0dd2ca1389 HDFS-4346. Merge change r1428167 and r1428560 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471598 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:59:08 +00:00
Suresh Srinivas 9d7e92100b HDFS-4339. Merge change r1465835 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471596 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:42:14 +00:00
Suresh Srinivas 05dc1ca3a5 HDFS-4296. Merge r1420700 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471590 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:29:00 +00:00
Suresh Srinivas 2620203b1a HDFS-4334. Merge r1426429 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471582 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:20:09 +00:00
Suresh Srinivas 0b2af91bc6 HDFS-4209. Merge r1414447 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471574 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:16:25 +00:00
Suresh Srinivas c68bb9cb51 HDFS-4151. Merge r1406006 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471567 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:01:46 +00:00
Suresh Srinivas 19198ea31d HDFS-4215. Merge r1411947 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471530 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 16:46:50 +00:00
Suresh Srinivas 876c1c9098 HDFS-4206. Merge change r1410996 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471522 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 16:38:53 +00:00
Suresh Srinivas b2b151139c HDFS-4152. Merge r1406326 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471508 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 16:22:55 +00:00
Suresh Srinivas c5227bd362 Remove duplicate HDFS-4112 entries in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471503 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 16:14:51 +00:00
Suresh Srinivas 40aaaf000e HDFS-4124. Merge r1403304 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471500 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 16:10:59 +00:00
Suresh Srinivas 611b3fc5e6 HDFS-4129. Merge r1403956 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471433 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 14:28:58 +00:00
Aaron Myers 79de664f03 HDFS-4737. JVM path embedded in fuse binaries. Contributed by Sean Mackrory.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471216 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 00:48:23 +00:00
Kihwal Lee fbce046a88 svn merge -c 1469839 Merging from trunk to branch-2 to fix HDFS-4699.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469840 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 14:11:28 +00:00
Suresh Srinivas b3941c65e8 HDFS-4695. Merge 1469015 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469018 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 18:14:16 +00:00
Suresh Srinivas 16d41cabf9 HDFS-4693. Merge 1468457 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468469 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 15:39:20 +00:00
Konstantin Shvachko a59b953861 HDFS-4639. startFileInternal() should not increment generation stamp. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467535 13f79535-47bb-0310-9956-ffa450edef68
2013-04-13 01:36:46 +00:00
Kihwal Lee c9b9ebde1d svn merge -c 1467307 Merging from trunk to branch-2 to fix HDFS-4477.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467308 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 15:19:59 +00:00
Thomas Graves 61ce78582f Preparing for release 0.23.7
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467070 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 20:09:26 +00:00
Suresh Srinivas 71a4677b36 HDFS-4679. Merge 1466721 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466729 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 23:17:23 +00:00
Arun Murthy 91a676fc41 Setting version in branch-2 to be 2.0.5-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466320 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 03:16:30 +00:00