Дерево:
8f676162e5
HADOOP-10388
HADOOP-11671
HADOOP-11890
HADOOP-12499
HADOOP-12756
HADOOP-12930
HADOOP-13037
HADOOP-13070
HADOOP-13128
HADOOP-13341
HADOOP-13345
HADOOP-15407
HADOOP-15461
HADOOP-15566-OpenTracing
HADOOP-17773
HADOOP-17800
HADOOP-18088-branch-2.10
HADOOP-18127
HADOOP-19236
HADOOP-19236-01
HADOOP-19236-02
HADOOP-19236-core-v0.1
HADOOP-19236-original
HADOOP-19238
HADOOP-19256-s3-conditional-writes
HADOOP-19343
HADOOP-6659
HADOOP-6671
HADOOP-6685
HDDS-1564
HDDS-1880-Decom
HDDS-2067
HDDS-2071
HDDS-48
HDFS-10285
HDFS-10467
HDFS-1052
HDFS-1073
HDFS-11118
HDFS-12090
HDFS-12943
HDFS-12996
HDFS-1312
HDFS-13532
HDFS-13572
HDFS-13891
HDFS-14978_ec_conversion
HDFS-15714
HDFS-1623
HDFS-17384
HDFS-17385
HDFS-17531
HDFS-17564
HDFS-2006
HDFS-2139
HDFS-265
HDFS-2802
HDFS-2832
HDFS-3042
HDFS-3077
HDFS-3092
HDFS-3140
HDFS-326
HDFS-347
HDFS-4685
HDFS-4949
HDFS-5442
HDFS-5535
HDFS-5698
HDFS-6581
HDFS-6584
HDFS-6994
HDFS-7240
HDFS-7285
HDFS-7285-REBASE
HDFS-7285-backup
HDFS-7836
HDFS-7966
HDFS-8707
HDFS-8966
HDFS-9806
HDFS-9924
HDFS-EC
HEAD
MAPREDUCE-6240-trunk
MAPREDUCE-6608
MR-2454
MR-279
MR-279-merge
MR-279-merge-to-trunk
MR-2841
MR-3902
MR-4327
MR-6749
YARN-1011
YARN-1051
YARN-1197
YARN-2139
YARN-2915
YARN-2928
YARN-321
YARN-321-old
YARN-3368
YARN-3368_branch2
YARN-3409
YARN-3866
YARN-3926
YARN-4752
YARN-4757
YARN-4902
YARN-5085
YARN-5355
YARN-5355_branch2
YARN-5501
YARN-5673
YARN-5734
YARN-5734-branch-2
YARN-5734-branch-3.0
YARN-5881
YARN-5972
YARN-6592
YARN-6828
YARN-7055
YARN-7402
YARN-8006
YARN-8200
YARN-8200.branch3
YARN-8310.branch-3.1
branch-0.1
branch-0.10
branch-0.11
branch-0.12
branch-0.13
branch-0.14
branch-0.15
branch-0.16
branch-0.17
branch-0.18
branch-0.19
branch-0.2
branch-0.20
branch-0.20-append
branch-0.20-security
branch-0.20-security-202
branch-0.20-security-203
branch-0.20-security-204
branch-0.20-security-205
branch-0.20-security-patches
branch-0.20.203
branch-0.20.204
branch-0.20.205
branch-0.21
branch-0.21-old
branch-0.22
branch-0.23
branch-0.23-PB
branch-0.23-PB-merge
branch-0.23-PB-merge2
branch-0.23-PB-merge3
branch-0.23.0
branch-0.23.0-rc0
branch-0.23.1
branch-0.23.10
branch-0.23.11
branch-0.23.2
branch-0.23.3
branch-0.23.4
branch-0.23.5
branch-0.23.6
branch-0.23.7
branch-0.23.8
branch-0.23.9
branch-0.3
branch-0.4
branch-0.5
branch-0.6
branch-0.7
branch-0.8
branch-0.9
branch-1
branch-1-win
branch-1.0
branch-1.0.2
branch-1.1
branch-1.2
branch-2
branch-2-jhung-test
branch-2.0-alpha
branch-2.0.0-alpha
branch-2.0.1-alpha
branch-2.0.2-alpha
branch-2.0.3-alpha
branch-2.0.4-alpha
branch-2.0.5
branch-2.0.5-alpha
branch-2.0.6-alpha
branch-2.1-beta
branch-2.1.0-alpha
branch-2.1.0-beta
branch-2.1.1-beta
branch-2.10
branch-2.10.0
branch-2.10.1
branch-2.10.2
branch-2.2
branch-2.2.0
branch-2.2.1
branch-2.3
branch-2.3.0
branch-2.4
branch-2.4.0
branch-2.4.1
branch-2.5
branch-2.5.0
branch-2.5.1
branch-2.5.2
branch-2.6
branch-2.6.0
branch-2.6.1
branch-2.6.2
branch-2.6.3
branch-2.6.4
branch-2.6.5
branch-2.7
branch-2.7.0
branch-2.7.1
branch-2.7.2
branch-2.7.3
branch-2.7.4
branch-2.7.5
branch-2.7.6
branch-2.7.7
branch-2.8
branch-2.8.0
branch-2.8.1
branch-2.8.2
branch-2.8.3
branch-2.8.4
branch-2.8.5
branch-2.9
branch-2.9.0
branch-2.9.1
branch-2.9.2
branch-3
branch-3.0
branch-3.0.0
branch-3.0.0-alpha1
branch-3.0.0-alpha2
branch-3.0.0-alpha3
branch-3.0.0-alpha4
branch-3.0.0-beta1
branch-3.0.1
branch-3.0.2
branch-3.0.3
branch-3.1
branch-3.1.0
branch-3.1.1
branch-3.1.2
branch-3.1.3
branch-3.1.4
branch-3.2
branch-3.2.0
branch-3.2.1
branch-3.2.2
branch-3.2.3
branch-3.2.4
branch-3.3
branch-3.3.0
branch-3.3.1
branch-3.3.2
branch-3.3.3
branch-3.3.4
branch-3.3.5
branch-3.3.6
branch-3.4
branch-3.4.0
branch-3.4.1
branch-3.4.2
branch-X.Y
branch-trunk-win
branch-yarn-3926
checks2
dependabot/maven/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/ch.qos.logback-logback-classic-1.2.0
dependabot/maven/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/ch.qos.logback-logback-classic-1.2.13
dependabot/maven/hadoop-maven-plugins/org.apache.maven-maven-core-3.8.1
dependabot/maven/hadoop-project/io.netty-netty-common-4.1.118.Final
dependabot/maven/hadoop-project/io.netty-netty-handler-4.1.118.Final
dependabot/maven/hadoop-project/io.netty-netty-handler-4.1.94.Final
dependabot/maven/hadoop-project/org.apache.avro-avro-1.11.4
dependabot/maven/hadoop-project/org.apache.mina-mina-core-2.0.27
dependabot/maven/hadoop-project/org.eclipse.jetty-jetty-server-10.0.14
dependabot/maven/hadoop-project/org.eclipse.jetty-jetty-server-9.4.55.v20240627
dependabot/maven/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/io.grpc-grpc-protobuf-1.53.0
dependabot/npm_and_yarn/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/jquery-3.5.0
dependabot/npm_and_yarn/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/es5-ext-0.10.64
dependabot/npm_and_yarn/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/express-4.18.2
dependabot/npm_and_yarn/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/express-4.20.0
dependabot/npm_and_yarn/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/follow-redirects-1.14.9
dependabot/npm_and_yarn/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/follow-redirects-1.15.6
dependabot/npm_and_yarn/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/handlebars-3.0.8
dependabot/npm_and_yarn/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ini-1.3.8
dependabot/npm_and_yarn/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/select2-4.0.6
dependabot/npm_and_yarn/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/websocket-extensions-0.1.4
docker-hadoop-2
docker-hadoop-2.10.2
docker-hadoop-3
docker-hadoop-3.3.6
docker-hadoop-3.4
docker-hadoop-3.4.1
docker-hadoop-runner
docker-hadoop-runner-jdk11
docker-hadoop-runner-jdk11-u2204
docker-hadoop-runner-jdk17-u2204
docker-hadoop-runner-jdk8
docker-hadoop-runner-latest
feature-HADOOP-18028-s3a-prefetch
feature-HADOOP-18028-s3a-prefetch-branch-3.3
feature-HADOOP-18073-s3a-sdk-upgrade
feature-HADOOP-18073-s3a-sdk-upgrade-3.3
feature-HADOOP-18073-sdk-v2-upgrade-3.7-aws
feature-HADOOP-19363-analytics-accelerator-s3
feature-HDFS-8286
feature-YARN-2928
feature-vectored-io
fgl
fs-encryption
gh-pages
new-branch-3.1-03.17.2018
ozone-0.2
ozone-0.3
ozone-0.4
ozone-0.4.1
pre-HADOOP-4687
resource-types
revert-1370-HDFS-14492
revert-1578-HDDS-2222
revert-2059-HDFS-15396
revert-2197-trunk
revert-2453-HADOOP-17371
revert-2605-HDFS-15423
revert-3200-hdfs-15160-320
revert-3484-fix-winutils-typos
revert-3630-HADOOP-17995
revert-3798-HDFS-16384
revert-3998-HDFS-16458
revert-4035-HDFS-16488
revert-4140-HADOOP-18168
revert-4199-HDFS-14750
revert-4901-HDFS-16776
revert-5068-HDFS-16811
revert-5267-fix-the-the-typos
revert-5332-YARN-11041
revert-6042-MAPREDUCE-7453
revert-6537-HADOOP-19071
revert-6664-HADOOP-19071-V3
revert-6764-HDFS-17496
revert-6816-dependabot/maven/hadoop-project/org.apache.derby-derby-10.17.1.0
revert-6960-YARN-11709
revert-7025-distcp-a
revert-7085-HADOOP-19298
revert-7188-HDFS-17640
revert-7294-HADOOP-19236-01
revert-7505-HADOOP-19502
rewrite-junit5-hdfs
saved-branch-3.1-03172018
squashed-YARN-4752
submarine-0.2
submarine-0.2.0
trunk
yahoo-merge
yarn-2877
yarn-4719
yarn-4726
yarn-native-services
release-3.4.2-RC1
rel/release-3.4.1
release-3.4.1-RC3
release-3.4.1-RC2
release-3.4.1-RC1
rel/release-3.4.0
release-3.4.0-RC3
release-3.4.0-RC2
release-3.4.0-RC1
release-3.4.0-RC0
rel/release-3.3.6
release-3.3.6-RC1
release-3.3.6-RC0
rel/release-3.3.5
release-3.3.5-RC3
release-3.3.5-RC2
release-3.3.5-RC1
release-3.3.5-RC0
rel/release-3.3.4
release-3.3.4-RC1
rel/release-3.2.4
release-3.3.4-RC0
release-3.2.4-RC0
rel/release-2.10.2
release-2.10.2-RC0
rel/release-3.3.3
release-3.3.3-RC1
release-3.3.3-RC0
rel/release-3.2.3
release-3.2.3-RC1
release-3.2.3-RC0
rel/release-3.3.2
release-3.3.2-RC5
release-3.3.2-RC4
release-3.3.2-RC3
release-3.3.2-RC2
release-3.3.2-RC1
release-3.3.2-RC0
rel/release-3.3.1
release-3.3.1-RC3
release-3.3.1-RC2
release-3.3.1-RC1
release-3.3.1-RC0
rel/release-3.2.2
release-3.2.2-RC5
release-3.2.2-RC4
release-3.2.2-RC3
release-3.2.2-RC2
release-3.2.2-RC1
release-3.2.2-RC0
rel/release-2.10.1
release-2.10.1-RC0
rel/release-3.1.4
release-3.1.4-RC4
rel/release-3.3.0
release-3.1.4-RC3
release-3.3.0-RC0
release-3.1.4-RC2
release-3.1.4-RC1
release-3.1.4-RC0
remove-ozone
rel/release-2.10.0
release-2.10.0-RC1
release-2.10.0-RC0
ozone-0.4.1-alpha
ozone-0.4.1-alpha-RC0
rel/release-3.1.3
rel/release-3.2.1
release-3.2.1-RC0
release-3.1.3-RC0
rel/submarine-0.2.0
submarine-0.2.0-RC0
ozone-0.4.0-alpha-RC2
ozone-0.4.0-alpha-RC1
ozone-0.4.0-alpha-RC0
rel/release-3.1.2
release-3.1.2-RC1
release-3.1.2-RC0
rel/release-3.2.0
release-3.2.0-RC1
release-3.2.0-RC0
ozone-0.3.0-alpha
rel/release-2.9.2
ozone-0.3.0-alpha-RC1
release-2.9.2-RC0
ozone-0.3.0-alpha-RC0
ozone-0.2.1-alpha-RC0
rel/release-2.8.5
release-2.8.5-RC0
rel/release-3.1.1
release-3.1.1-RC0
rel/release-2.7.7
rel/release-3.0.3
rel/release-X.Y.Z
release-2.7.7-RC0
release-3.0.3-RC0
rel/release-2.8.4
release-2.8.4-RC0
rel/release-2.9.1
rel/release-3.0.2
rel/release-2.7.6
release-2.9.1-RC0
release-3.0.2-RC1
release-2.7.6-RC0
release-3.0.2-RC0
rel/release-3.1.0
release-3.1.0-RC1
rel/release-3.0.1
release-3.1.0-RC0
release-3.0.1-RC1
YARN-7055-2018-03-02
release-3.0.1-RC0
rel/release-3.0.0
rel/release-2.7.5
rel/release-2.8.3
rel/release-
release-3.0.0-RC1
release-2.7.5-RC1
release-2.8.3-RC0
release-2.7.5-RC0
rel/release-2.9.0
release-3.0.0-RC0
release-2.9.0-RC3
release-2.9.0-RC2
release-2.9.0-RC1
release-2.9.0-RC0
rel/release-2.8.2
release-2.8.2-RC1
YARN-5355_branch2-2017-10-17
YARN-5355_branch2-2017-10-14
rel/release-3.0.0-beta1
release-3.0.0-beta1-RC0
rel/release-2.7.4
release-2.8.2-RC0
YARN-5355_branch2-2017-08-31
YARN-5355-2017-08-31
release-2.7.4-RC0
rel/release-3.0.0-alpha4
release-3.0.0-alpha4-RC0
rel/release-2.8.1
rel/release-3.0.0-alpha3
YARN-5355-branch-2-2017-04-25
YARN-5355-2017-04-25
rel/release-2.8.0
release-2.8.0-RC3
release-2.8.0-RC2
rel/release-3.0.0-alpha2
release-3.0.0-alpha2-RC0
release-2.8.0-RC1
release-2.8.0-RC0
YARN-5355-branch-2-2016-11-06
YARN-5355-2016-11-06
rel/release-2.6.5
release-2.6.5-RC1
release-2.6.5-RC0
rel/release-3.0.0-alpha1
release-3.0.0-alpha1-RC0
rel/release-2.7.3
release-2.7.3-RC2
release-2.7.3-RC1
release-2.7.3-RC0
YARN-2928-2016-07-10
YARN-2928-2016-07-08
YARN-2928-2016-06-21
rel/release-2.6.4
release-2.6.4-RC0
rel/release-2.7.2
feature_YARN-2928-2016-01-20
release-2.7.2-RC2
release-2.6.3
release-2.7.2-RC1
release-2.6.3-RC0.1
release-2.6.3-RC0
release-2.6.3-RC1
release-2.5.0
release-2.7.0
release-2.7.2-RC0
feature_YARN-2928-2015-11-09
release-2.6.2
release-2.6.2-RC0
release-2.6.1
HADOOP-12111-moved-to-yetus
release-2.6.1-RC1
release-2.6.1-RC0
feature_YARN-2928_2015-08-24
release-2.7.1
release-2.7.1-RC0
release-2.7.0-RC0
release-2.6.0
release-2.5.2
release-2.5.2-RC1
release-2.6.0-rc1
release-2.6.0-rc0
release-2.5.2-RC0
release-2.5.1
release-2.5.0-rc2
release-2.5.0-rc1
release-2.5.0-rc0
release-2.4.1
release-0.23.11
release-2.4.1-rc1
release-0.23.11-rc0
release-2.4.1-rc0
release-2.4.0
release-2.4.0-rc0
release-2.3.0
release-2.3.0-rc0
release-0.23.10
release-0.23.10-rc0
release-2.2.1-rc0
release-2.1.1-rc0
release-2.2.0
release-2.2.0-rc0
release-2.1.1-beta-rc0
release-2.1.0-beta
release-2.0.6-alpha
release-2.0.6-alpha-rc1
release-2.1.0-beta-rc2
release-2.0.6-alpha-rc0
branch-2.0.6-alpha-rc0
release-1.2.1
release-2.1.0-beta-rc1
release-1.2.1-rc0
release-0.23.9
release-0.23.9-rc0
release-2.1.0-beta-rc0
release-2.0.5-alpha
release-0.23.8
release-2.0.5-alpha-rc2
2.0.5-alpha-rc2
release-2.0.5-alpha-rc1
release-2.0.5-alpha-rc0
release-0.23.8-rc0
release-2.0.4.1-alpha-rc0
release-1.2.0
release-1.2.0-rc1
release-2.0.4-alpha
release-0.23.7
release-2.0.4-alpha-rc2
release-1.2.0-rc0
release-2.0.4-alpha-rc1
release-0.23.7-rc0
release-2.0.4-alpha-rc0
release-1.1.2
release-2.0.3-alpha
release-2.0.3-alpha-rc0
release-0.23.6
release-1.1.2-rc5
release-0.23.6-rc1
release-0.23.6-rc1-old
release-1.1.2-rc4
release-1.1.2-rc3
release-0.23.6-rc0
release-1.1.2-rc1
release-1.1.2-rc0
release-1.1.1
release-0.23.5
release-0.23.5-rc0
release-1.1.1-rc0
release-0.23.4
release-1.1.0
release-1.0.4
release-2.0.2-alpha
release-0.23.4-rc2
release-1.1.0-rc5
release-1.0.4-rc0
release-2.0.2-alpha-rc2
release-0.23.4-rc1
release-2.0.2-alpha-rc1
release-0.23.4-rc0
release-2.0.2-alpha-rc0
release-1.1.0-rc4
release-0.23.3
release-0.23.3-rc0
release-1.1.0-rc3
release-2.0.1-alpha
release-1.1.0-rc2
release-1.1.0-rc1
release-1.1.0-rc0
release-2.0.0-alpha
release-1.0.3
release-1.0.3-rc1
release-2.0.0-alpha-rc1
release-2.0.0-alpha-rc0
release-1.0.3-rc0
release-1.0.2
release-0.23.2-rc0
release-1.0.2-rc2
release-1.0.2-rc1
release-0.23.1
release-1.0.1
release-0.23.1-rc2
release-0.23.1-rc1
release-1.0.1-rc1
release-0.23.1-rc0
release-1.0.0
release-1.0.0-rc3
release-0.22.0
release-0.22.0-rc0
release-1.0.0-rc2
0.92RC0
release-0.23.0
release-0.23.0-rc2
release-0.23.0-rc1
release-0.23.0-rc0
release-0.20.205.0
release-0.20.205.0-rc2
release-0.20.205.0-rc1
release-0.20.204.0
release-0.20.204.0-rc3
release-0.20.204.0-rc2
release-0.20.204-rc1
release-0.20.204.0-rc0
release-0.21.0
release-0.20.203.0
release-0.20.203.0-rc1
release-0.20.203.0-rc0
branch-0.20.203.0-rc0
release-0.20.3-rc2
release-0.20.3-rc1
release-0.20.3-rc0
release-0.21.0-rc2
release-0.21.0-rc1
release-0.21.0-rc0
release-0.20.2
release-0.20.2-rc4
release-0.20.2-rc3
release-0.20.2-rc2
release-0.20.2-rc1
release-0.20.1
release-0.20.1-rc1
release-0.20.1-rc0
release-0.19.2
release-0.19.2-rc0
release-0.1.0
release-0.1.1
release-0.10.0
release-0.10.1
release-0.11.0
release-0.11.1
release-0.11.2
release-0.12.0
release-0.12.1
release-0.12.3
release-0.13.0
release-0.13.1
release-0.14.0
release-0.14.1
release-0.14.2
release-0.14.3
release-0.14.4
release-0.15.0
release-0.15.1
release-0.15.2
release-0.15.3
release-0.16.0
release-0.16.1
release-0.16.2
release-0.16.3
release-0.16.4
release-0.17.0
release-0.17.1
release-0.17.2
release-0.18.0
release-0.18.1
release-0.18.2
release-0.18.3
release-0.19.0
release-0.19.1
release-0.2.0
release-0.2.1
release-0.20.0
release-0.3.0
release-0.3.1
release-0.3.2
release-0.4.0
release-0.5.0
release-0.6.0
release-0.6.1
release-0.6.2
release-0.7.0
release-0.7.1
release-0.8.0
release-0.9.0
release-0.9.1
release-0.9.2
Michael Stack
8f676162e5
HDFS-6047 TestPread NPE inside in DFSInputStream hedgedFetchBlockByteRange (stack)
|
11 роки тому | |
|---|---|---|
| dev-support | e775dc3485 HDFS-5767. Merging change r1564141 from trunk | 11 роки тому |
| hadoop-assemblies | 8b6b88f0fa YARN-1242. Changed yarn scripts to be able to start ApplicationHistoryServer as an individual process. Contributed by Mayank Bansal. | 11 роки тому |
| hadoop-client | 439a690ad1 Setting version to 2.4.0-SNAPSHOT in branch-2. | 11 роки тому |
| hadoop-common-project | d5f65997ba HDFS-6040. fix DFSClient issue without libhadoop.so and some other ShortCircuitShm cleanups (cmccabe) | 11 роки тому |
| hadoop-dist | 439a690ad1 Setting version to 2.4.0-SNAPSHOT in branch-2. | 11 роки тому |
| hadoop-hdfs-project | 8f676162e5 HDFS-6047 TestPread NPE inside in DFSInputStream hedgedFetchBlockByteRange (stack) | 11 роки тому |
| hadoop-mapreduce-project | c1d083ed18 YARN-986. Changed client side to be able to figure out the right RM Delegation token for the right ResourceManager when HA is enabled. Contributed by Karthik Kambatla. | 11 роки тому |
| hadoop-maven-plugins | 439a690ad1 Setting version to 2.4.0-SNAPSHOT in branch-2. | 11 роки тому |
| hadoop-minicluster | 439a690ad1 Setting version to 2.4.0-SNAPSHOT in branch-2. | 11 роки тому |
| hadoop-project | c9b6c3c36c YARN-1635. Implemented a Leveldb based ApplicationTimelineStore. Contributed by Billie Rinaldi. | 11 роки тому |
| hadoop-project-dist | 439a690ad1 Setting version to 2.4.0-SNAPSHOT in branch-2. | 11 роки тому |
| hadoop-tools | 673ba4c00e YARN-1504. RM changes for moving apps between queues (Sandy Ryza) | 11 роки тому |
| hadoop-yarn-project | c1d083ed18 YARN-986. Changed client side to be able to figure out the right RM Delegation token for the right ResourceManager when HA is enabled. Contributed by Karthik Kambatla. | 11 роки тому |
| .gitattributes | a5467739bb HADOOP-10040. Merging change r1531983 from trunk to branch-2. | 11 роки тому |
| .gitignore | 24e3d83445 Merge -r 1212059:1212060 from trunk to branch. FIXES: HDFS-2178 | 13 роки тому |
| BUILDING.txt | a74230974f HADOOP-10240. Merging change r1559278 from trunk to branch-2. | 11 роки тому |
| pom.xml | eb9010719e HADOOP-10273. Merging r1564638 from trunk to branch-2. | 11 роки тому |