[2/2] git commit: Merge branch 'trunk' into HDFS-6581
Merge branch 'trunk' into HDFS-6581 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/368e2423 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/368e2423 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/368e2423 Branch: refs/heads/HDFS-6581 Commit: 368e2423a57702a264ec2e2a0bea4b2fef05fbf8 Parents: 7f0422b 0577eb3 Author: arp a...@apache.org Authored: Mon Sep 29 20:09:06 2014 -0700 Committer: arp a...@apache.org Committed: Mon Sep 29 20:09:06 2014 -0700 -- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt| 3 +++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs | 4 .../hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm | 6 ++ 3 files changed, 13 insertions(+) --
[2/2] git commit: Merge branch 'trunk' into HDFS-6581
Merge branch 'trunk' into HDFS-6581 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0b10e5a0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0b10e5a0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0b10e5a0 Branch: refs/heads/HDFS-6581 Commit: 0b10e5a0f7ce3eda6d48a0463a5170cb7061835c Parents: 5e4627d 570b8b4 Author: arp a...@apache.org Authored: Thu Sep 18 12:10:45 2014 -0700 Committer: arp a...@apache.org Committed: Thu Sep 18 12:10:45 2014 -0700 -- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 + .../hadoop-hdfs/src/main/native/libhdfs/hdfs.c | 69 +++- .../hadoop-hdfs/src/main/native/libhdfs/hdfs.h | 8 +++ .../main/native/libhdfs/test_libhdfs_threaded.c | 1 + 4 files changed, 77 insertions(+), 3 deletions(-) --
[2/2] git commit: Merge branch 'trunk' into HDFS-6581
Merge branch 'trunk' into HDFS-6581 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e4d29fda Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e4d29fda Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e4d29fda Branch: refs/heads/HDFS-6581 Commit: e4d29fda72fbaac0ec85f022155689131dd1a62e Parents: f8bbf80 6fe5c6b Author: arp a...@apache.org Authored: Thu Sep 18 22:45:07 2014 -0700 Committer: arp a...@apache.org Committed: Thu Sep 18 22:45:07 2014 -0700 -- .../hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java | 2 +- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java| 1 + .../yarn/server/resourcemanager/TestWorkPreservingRMRestart.java | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'trunk' into HDFS-6581
Merge branch 'trunk' into HDFS-6581 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/900f6e52 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/900f6e52 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/900f6e52 Branch: refs/heads/HDFS-6581 Commit: 900f6e52ec33ca82edb0d306d0bfecc1ba4d60e6 Parents: a186d51 f488611 Author: arp a...@apache.org Authored: Wed Sep 17 15:19:43 2014 -0700 Committer: arp a...@apache.org Committed: Wed Sep 17 15:19:43 2014 -0700 -- hadoop-yarn-project/CHANGES.txt | 3 + .../yarn/security/ContainerTokenIdentifier.java | 4 +- .../server/TestContainerManagerSecurity.java| 92 3 files changed, 97 insertions(+), 2 deletions(-) --
[2/2] git commit: Merge branch 'trunk' into HDFS-6581
Merge branch 'trunk' into HDFS-6581 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/de20cf28 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/de20cf28 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/de20cf28 Branch: refs/heads/HDFS-6581 Commit: de20cf286bcbc0e74a857ebe0e7f6c01e2b542fa Parents: 0d2f6b4 0de563a Author: arp a...@apache.org Authored: Tue Sep 9 18:09:39 2014 -0700 Committer: arp a...@apache.org Committed: Tue Sep 9 18:09:39 2014 -0700 -- --