HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal)
HDFS-6924. Add new RAM_DISK storage type. (Arpit Agarwal)
HDFS-6922. Add LazyPersist flag to INodeFile, save it in FsImage and edit logs. (Arpit Agarwal)
HDFS-6923. Propagate LazyPersist flag to DNs via DataTransferProtocol. (Arpit Agarwal)
HDFS-6925. DataNode should attempt to place replicas on transient storage first if lazyPersist flag is received. (Arpit Agarwal)
HDFS-6926. DN support for saving replicas to persistent storage and evicting in-memory replicas. (Arpit Agarwal)
HDFS-6927. Initial unit tests for Lazy Persist files. (Arpit Agarwal)
HDFS-6929. NN periodically unlinks lazy persist files with missing replicas from namespace. (Arpit Agarwal)
Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581
HDFS-6928. 'hdfs put' command should accept lazyPersist flag for testing. (Arpit Agarwal)
HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu)
Fixing CHANGES.txt, moving HADOOP-8815 to 2.6.0 release
Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2

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

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fix typos in log messages. Contributed by Ray Chiang
Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
HDFS-6960. Bugfix in LazyWriter, fix test case and some refactoring. (Arpit Agarwal)
HDFS-6931. Move lazily persisted replicas to finalized directory on DN startup. (Arpit Agarwal)
Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581
Merge trunk into HDFS-6581