Commit Graph

2274 Commits

Author SHA1 Message Date
Yongjun Zhang 45cc7514f5 HADOOP-11692. Improve authentication failure WARN message to avoid user confusion. Contributed by Yongjun Zhang.
(cherry picked from commit de1101cb5b)

Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
2015-03-09 12:12:29 -07:00
Haohui Mai d8d8ed35f0 HADOOP-11686. MiniKDC cannot change ORG_NAME or ORG_DOMAIN. Contributed by Duo Zhang. 2015-03-09 11:08:35 -07:00
Tsuyoshi Ozawa b46f9e72db HADOOP-11602. Backport 'Fix toUpperCase/toLowerCase to use Locale.ENGLISH.' (ozawa) 2015-03-09 19:53:55 +09:00
Vinod Kumar Vavilapalli d9416317a9 Preparing for 2.8.0 development. Changing SNAPSHOT version to be 2.8 on branch-2. 2015-03-08 20:32:51 -07:00
Vinod Kumar Vavilapalli 8e6f8e9a04 Adding 2.8 section in CHANGES.txt 2015-03-08 20:26:57 -07:00
Steve Loughran b8a2087951 HADOOP-11670. Regression: s3a auth setup broken. (Adam Budde via stevel) 2015-03-08 11:22:01 -07:00
cnauroth 02cadbd24b HADOOP-11642. Upgrade azure sdk version from 0.6.0 to 2.0.0. Contributed by Shashank Khandelwal and Ivan Mitic.
(cherry picked from commit 608ebd52ba)

Conflicts:
	hadoop-project/pom.xml
2015-03-06 15:29:22 -08:00
Jian He 6cef2c16de YARN-2190. Added CPU and memory limit options to the default container executor for Windows containers. Contributed by Chuan Liu
(cherry picked from commit 21101c01f2)
2015-03-06 14:18:56 -08:00
yliu b569c3ab1c HADOOP-11674. oneByteBuf in CryptoInputStream and CryptoOutputStream should be non static. (Sean Busbey via yliu) 2015-03-05 06:39:58 +08:00
Tsuyoshi Ozawa f805d48b19 HADOOP-11648. Set DomainSocketWatcher thread name explicitly. Contributed by Liang Xie.
(cherry picked from commit 74a4754d1c)
2015-03-05 16:06:37 +09:00
Karthik Kambatla 0d62e94887 YARN-3242. Asynchrony in ZK-close can lead to ZKRMStateStore watcher receiving events for old client. (Zhihai Xu via kasha)
(cherry picked from commit 8d88691d16)
2015-03-04 19:49:21 -08:00
Akira Ajisaka 31b3f84601 HADOOP-11666. Revert the format change of du output introduced by HADOOP-6857. Contributed by Byron Wong. 2015-03-03 21:46:28 -08:00
Steve Loughran 824c32de1a HADOOP-11183. Memory-based S3AOutputstream. (Thomas Demoor via stevel) 2015-03-03 16:18:39 -08:00
Gera Shegalov 5e235802de HADOOP-11605. FilterFileSystem#create with ChecksumOpt should propagate it to wrapped FS. (gera)
(cherry picked from commit b18d3830ac)
2015-03-02 18:16:58 -08:00
Steve Loughran fe7df5b4d8 HADOOP-11449 / HADOOP-10320 ; reverting patch 6cda3a7 which triggered regression in javadocs on some java8 compilers (stevel on behalf of cnauroth) 2015-03-02 18:15:24 -08:00
Akira Ajisaka fcd817afb0 HADOOP-11658. Externalize io.compression.codecs property. Contributed by Kai Zheng.
(cherry picked from commit 0650e1c56f2d87ca9bdc51d7d4678895f494464a)
2015-03-02 01:13:10 -08:00
Akira Ajisaka c40293c828 HADOOP-11615. Update ServiceLevelAuth.md for YARN. Contributed by Brahma Reddy Battula.
(cherry picked from commit dd9cd0797c)
2015-03-01 22:16:59 -08:00
Tsuyoshi Ozawa 3854b21c4c HADOOP-11634. Description of webhdfs' principal/keytab should switch places each other. Contributed by Brahma Reddy Battula.
(cherry picked from commit e9ac88aac7)
2015-03-02 04:18:39 +09:00
Akira Ajisaka 0e10c70445 Fixed CHANGES.txt for HADOOP-10976. 2015-02-28 17:16:52 -08:00
Akira Ajisaka f7a724ca9e HADOOP-10976. Backport "moving the source code of hadoop-tools docs to the directory under hadoop-tools" to branch-2. Contributed by Masatake Iwasaki.
(cherry picked from commit 9112f093cd)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-02-28 17:06:58 -08:00
Tsuyoshi Ozawa 02df51497f HADOOP-11569. Provide Merge API for MapFile to merge multiple similar MapFiles to one MapFile. Contributed by Vinayakumar B.
(cherry picked from commit 48c7ee7553)
2015-02-27 17:46:29 +09:00
cnauroth 264c96777e HADOOP-9922. hadoop windows native build will fail in 32 bit machine. Contributed by Kiran Kumar M R.
(cherry picked from commit 2214dab60f)
2015-02-26 12:41:48 -08:00
Andrew Wang 0512e50d6e HADOOP-11620. Add support for load balancing across a group of KMS for HA. Contributed by Arun Suresh.
(cherry picked from commit 71385f9b70)
2015-02-25 21:17:44 -08:00
cnauroth 1bc4c6808d HADOOP-11629. WASB filesystem should not start BandwidthGaugeUpdater if fs.azure.skip.metrics set to true. Contributed by Shanyu Zhao.
(cherry picked from commit 5731c0e0d0)
2015-02-25 09:09:15 -08:00
Tsuyoshi Ozawa 75fd43be02 HADOOP-11632. Cleanup Find.java to remove SupressWarnings annotations. Contributed by Akira AJISAKA.
(cherry picked from commit ad8ed3e802)
2015-02-25 16:25:21 +09:00
Akira Ajisaka e97613b429 HADOOP-11480. Typo in hadoop-aws/index.md uses wrong scheme for test.fs.s3.name. Contributed by Ted Yu.
(cherry picked from commit 1a625b8158)
2015-02-24 17:13:35 -08:00
Colin Patrick Mccabe 343cffb0ea HADOOP-11495. Backport "convert site documentation from apt to markdown" to branch-2 (Masatake Iwasaki via Colin P. McCabe)
(cherry-picked from commit b6fc1f3e43)

Conflicts:
    hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/RackAwareness.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/SingleCluster.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/SecureMode.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/Tracing.apt.vm
    hadoop-project/src/site/site.xml
2015-02-24 15:48:58 -08:00
Gera Shegalov 62e0e67d49 HADOOP-11619. FTPFileSystem should override getDefaultPort. (Brahma Reddy Battula via gera)
(cherry picked from commit 1dba57271f)
2015-02-23 21:19:57 -08:00
Akira Ajisaka 6bbb051d38 HADOOP-8642. Document that io.native.lib.available only controls native bz2 and zlib compression codecs. (aajisaka)
(cherry picked from commit ab5976161f)
2015-02-23 17:35:46 -08:00
Haohui Mai 92acb0e4f4 HADOOP-10478. Fix new findbugs warnings in hadoop-maven-plugins. Contributed by Li Lu. 2015-02-23 16:38:10 -08:00
cnauroth 657a6e389b HDFS-7009. Active NN and standby NN have different live nodes. Contributed by Ming Ma.
(cherry picked from commit 769507bd7a)
2015-02-23 15:12:36 -08:00
Arpit Agarwal 83f779e49a HDFS-7806. Refactor: move StorageType from hadoop-hdfs to hadoop-common. (Contributed by Xiaoyu Yao) 2015-02-21 15:48:59 -08:00
Steve Loughran a36cad0522 HADOOP-11584 s3a file block size set to 0 in getFileStatus. (Brahma Reddy Battula via stevel) 2015-02-21 12:02:41 +00:00
Robert Kanter 199a853ed7 HADOOP-11612. Workaround for Curator's ChildReaper requiring Guava 15+. (rkanter)
(cherry picked from commit 6f0133039a)
2015-02-20 19:51:35 -08:00
cnauroth 187e081d5a HADOOP-11604. Prevent ConcurrentModificationException while closing domain sockets during shutdown of DomainSocketWatcher thread. Contributed by Chris Nauroth.
(cherry picked from commit 3c5ff0759c)
2015-02-20 13:07:36 -08:00
Steve Loughran 4276f8b315 HADOOP-11607. Reduce log spew in S3AFileSystem. (Lei (Eddy) Xu via stevel) 2015-02-20 20:51:00 +00:00
cnauroth e09ba94f28 HDFS-7773. Additional metrics in HDFS to be accessed via jmx. Contributed by Anu Engineer. 2015-02-20 12:38:34 -08:00
Haohui Mai da52fdb999 HADOOP-11231. Remove dead code in ServletUtil. Contributed by Li Lu. 2015-02-19 11:35:35 -08:00
Jason Lowe b1fc4ec57a HADOOP-9087. Queue size metric for metric sinks isn't actually maintained. Contributed by Akira AJISAKA
(cherry picked from commit f0f2992686)
2015-02-19 17:38:39 +00:00
yliu 000b9e6c24 HADOOP-11595. Add default implementation for AbstractFileSystem#truncate. (yliu) 2015-02-19 08:28:15 +08:00
Akira Ajisaka 10da1bfce2 HADOOP-11440. Use "test.build.data" instead of "build.test.dir" for testing in ClientBaseWithFixes. Contributed by Kengo Seki.
(cherry picked from commit 18fb421fab)
2015-02-18 17:56:02 -08:00
Akira Ajisaka 5a1531fff6 HADOOP-11545. ArrayIndexOutOfBoundsException is thrown with "hadoop credential list -provider". Contributed by Brahma Reddy Battula.
(cherry picked from commit 1714609919)
2015-02-18 11:18:21 -08:00
Tsuyoshi Ozawa f10335b08d HADOOP-11599. Client#getTimeout should use IPC_CLIENT_PING_DEFAULT when IPC_CLIENT_PING_KEY is not configured. Contributed by zhihai xu.
(cherry picked from commit 3f56a4cb0c)
2015-02-18 18:00:18 +09:00
Kihwal Lee 6c01e58619 HADOOP-11295. RPC Server Reader thread can't shutdown if RPCCallQueue is full. Contributed by Ming Ma.
(cherry picked from commit 685af8a3d0)
2015-02-18 17:44:11 +09:00
Steve Loughran 411c8a7cda HADOOP-11521. Make connection timeout configurable in s3a. (Thomas Demoor via stevel) 2015-02-17 20:00:00 +00:00
Steve Loughran f52fcdc2e0 HADOOP-11522. Update S3A Documentation. (Thomas Demoor via stevel) 2015-02-17 18:14:31 +00:00
Steve Loughran 701b96ca8e HADOOP-11570. S3AInputStream.close() downloads the remaining bytes of the object from S3. (Dan Hecht via stevel). 2015-02-17 16:36:32 +00:00
Tsuyoshi Ozawa 00fb0710b6 HADOOP-11600. Fix up source codes to be compiled with Guava 17.0. (ozawa)
(cherry picked from commit 2f0f756b26)
2015-02-17 21:57:58 +09:00
Vinayakumar B 005e1df540 HADOOP-11000. HAServiceProtocol's health state is incorrectly transitioned to SERVICE_NOT_RESPONDING (Contributed by Ming Ma)
(cherry picked from commit cf4b7f506d)
2015-02-17 15:19:44 +05:30
Tsuyoshi Ozawa b7836c18e4 HADOOP-11589. NetUtils.createSocketAddr should trim the input URI. Contributed by Rakesh R.
(cherry picked from commit ef950ea1c0)
2015-02-15 00:31:33 +09:00
Tsuyoshi Ozawa 481124bd61 Revert "HADOOP-11589. NetUtils.createSocketAddr should trim the input URI. Contributed by Rakesh R."
This reverts commit e082992e2a.
2015-02-15 00:31:15 +09:00
Tsuyoshi Ozawa e082992e2a HADOOP-11589. NetUtils.createSocketAddr should trim the input URI. Contributed by Rakesh R.
(cherry picked from commit 965ce9e24e)
2015-02-15 00:13:38 +09:00
Robert Kanter ebf6499498 HADOOP-11467. KerberosAuthenticator can connect to a non-secure cluster. (yzhangal via rkanter)
(cherry picked from commit 875256834b)

Conflicts:
	hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationToken.java
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-02-13 14:12:38 -08:00
Xuan 3c4b5606dc YARN-3164. RMAdmin command usage prints incorrect command name.
Contributed by Bibin A Chundatt

(cherry picked from commit 253035491c)
2015-02-12 21:40:42 -08:00
Tsuyoshi Ozawa 46ad4c9098 HADOOP-11497. Fix typo in ClusterSetup.html#Hadoop_Startup. Contributed by Christian Winkler. 2015-02-13 12:34:27 +09:00
Akira Ajisaka 4d0e792a82 HADOOP-9869. Configuration.getSocketAddr()/getEnum() should use getTrimmed(). Contributed by Tsuyoshi Ozawa.
(cherry picked from commit 9395c76697)
2015-02-12 15:52:27 -08:00
Akira Ajisaka 7d6c3c6dbe HADOOP-11586. Update use of Iterator to Iterable in AbstractMetricsContext.java. Contributed by Ray Chiang.
(cherry picked from commit 11d8934463)
2015-02-12 14:42:10 -08:00
Colin Patrick Mccabe e35788aa5a HDFS-7694. FSDataInputStream should support "unbuffer" (cmccabe)
(cherry picked from commit 6b39ad0865)
2015-02-12 10:42:14 -08:00
Haohui Mai 92f52e8962 HADOOP-11587. TestMapFile#testMainMethodMapFile creates test files in hadoop-common project root. Contributed by Xiaoyu Yao. 2015-02-12 10:31:04 -08:00
Jing Zhao 2156e38d5e HDFS-3689. Add support for variable length block. Contributed by Jing Zhao.
(cherry picked from commit 2848db814a)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirConcatOp.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileAppend3.java
2015-02-12 10:23:13 -08:00
Tsuyoshi Ozawa c9c1d9a5a6 HADOOP-11543. Improve help message for hadoop/yarn command. Contributed by Brahma Reddy Battula. 2015-02-12 19:03:24 +09:00
cnauroth c9266132ee HADOOP-10140. Specification of HADOOP_CONF_DIR via the environment in hadoop_config.cmd. Contributed by Kiran Kumar M R.
(cherry picked from commit 67efab935e)
2015-02-11 16:36:18 -08:00
Konstantin V Shvachko ada7791ef4 HADOOP-11579. Documentation for truncate. Contributed by Konstantin Shvachko. 2015-02-11 10:03:54 -08:00
Steve Loughran a8eaec396f YARN-2683. [YARN-913] registry config options: document and move to core-default. (stevel) 2015-02-11 14:26:22 +00:00
Colin Patrick Mccabe 5e7deba1f4 HADOOP-10953. NetworkTopology#add calls NetworkTopology#toString without holding the netlock (Liang Xie via Colin P. McCabe)
(cherry picked from commit 6338ce3ae8)
2015-02-10 13:30:49 -08:00
Harsh J 442bc776db HADOOP-11512. Use getTrimmedStrings when reading serialization keys. Contributed by Ryan P. 2015-02-10 12:52:41 +05:30
yliu ae316705bb HADOOP-11510. Expose truncate API via FileContext. (yliu) 2015-02-10 01:43:08 +08:00
Arpit Agarwal ff900eb64a HDFS-7647. DatanodeManager.sortLocatedBlocks sorts DatanodeInfos but not StorageIDs. (Contributed by Milan Desai) 2015-02-09 12:17:53 -08:00
Steve Loughran af7368cf03 HADOOP-11520. Clean incomplete multi-part uploads in S3A tests. (Thomas Demoor via stevel) 2015-02-06 20:59:56 +00:00
Steve Loughran d827f02bcd HADOOP-11535 TableMapping related tests failed due to 'successful' resolving of invalid test hostname 2015-02-06 13:03:30 +00:00
Gera Shegalov 3d36d4737c HADOOP-11506. Configuration variable expansion regex expensive for long values. (Gera Shegalov via gera)
(cherry picked from commit 644548f201)

Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
	hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
2015-02-06 01:44:14 -08:00
yliu e2803f5a51 HDFS-7741. Remove unnecessary synchronized in FSDataInputStream and HdfsDataInputStream. (yliu) 2015-02-06 06:29:52 +08:00
Tsuyoshi Ozawa 995f9809c0 Revert "HADOOP-11543. Improve help message for hadoop/yarn command. Contributed by Brahma Reddy Battula."
This reverts commit 366a12c3b9.
2015-02-06 13:49:58 +09:00
Tsuyoshi Ozawa 366a12c3b9 HADOOP-11543. Improve help message for hadoop/yarn command. Contributed by Brahma Reddy Battula. 2015-02-06 13:34:48 +09:00
cnauroth a9ea7cff31 HADOOP-11526. Memory leak in Bzip2Compressor and Bzip2Decompressor. Contributed by Anu Engineer.
(cherry picked from commit 6583ad148b)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-02-05 16:56:16 -08:00
yliu 3ffe5a1ed2 HDFS-7655. Expose truncate API for Web HDFS. (yliu) 2015-02-05 23:48:55 +08:00
Steve Loughran 4cd9657b71 HADOOP-11463 Replace method-local TransferManager object with S3AFileSystem#transfers. (Ted Yu via stevel) 2015-02-05 12:19:49 +00:00
Junping Du f59b698fc9 HADOOP-10062. race condition in MetricsSystemImpl#publishMetricsNow that causes incorrect results. (Contributed by Sangjin Lee)
(cherry picked from commit 0b567f4246)
2015-02-04 19:12:21 -08:00
Akira Ajisaka 17797c73c2 HADOOP-11549. flaky test detection tool failed to handle special control characters in test result. Contributed by Yongjun Zhang.
(cherry picked from commit 5f4ef2d13f)
2015-02-04 14:18:31 -08:00
Karthik Kambatla fcf3dc5977 HADOOP-11492. Bump up curator version to 2.7.1. (Arun Suresh and Karthik Kambatla via kasha)
(cherry picked from commit 55235d28c3)
2015-02-04 14:00:44 -08:00
cnauroth 196443318f HADOOP-11547. hadoop-common native compilation fails on Windows due to missing support for __attribute__ declaration. Contributed by Chris Nauroth.
(cherry picked from commit a35e86c670)
2015-02-04 12:07:13 -08:00
Andrew Wang 696266e99c HDFS-7734. Class cast exception in NameNode#main. Contributed by Yi Liu.
(cherry picked from commit 9175105eea)
2015-02-04 11:31:49 -08:00
cnauroth 85b2739508 HADOOP-11548. checknative should display a nicer error message when openssl support is not compiled in. Contributed by Anu Engineer.
(cherry picked from commit 064e0770a0)
2015-02-04 10:01:39 -08:00
Tsuyoshi Ozawa f92d4fa20f HADOOP-11546. Checkstyle failing: Unable to instantiate DoubleCheckedLockingCheck. (ozawa)
(cherry picked from commit ba58da29f4)
2015-02-05 00:51:40 +09:00
Akira Ajisaka 5c5139d35f HADOOP-11544. Remove unused configuration keys for tracing. Contributed by Masatake Iwasaki.
(cherry picked from commit 42548f4dc2)
2015-02-04 04:20:08 -08:00
Haohui Mai 6c5ae1571c HADOOP-11529. Fix findbugs warnings in hadoop-archives. Contributed by Masatake Iwasaki. 2015-02-03 10:53:26 -08:00
Robert Kanter 410830fe8c YARN-3022. Expose Container resource information from NodeManager for monitoring (adhoot via ranter)
(cherry picked from commit f7a77819a1)
2015-02-03 10:39:51 -08:00
Tsuyoshi Ozawa b396d2e8d8 HADOOP-11045. Introducing a tool to detect flaky tests of hadoop jenkins testing job. Contributed by Yongjun Zhang and Todd Lipcon.
(cherry picked from commit 80705e034b)
2015-02-04 01:26:44 +09:00
cnauroth dedfb982f1 HADOOP-11442. hadoop-azure: Create test jar. Contributed by Shashank Khandelwal.
(cherry picked from commit 1c09ca2ba4)
2015-02-02 11:51:01 -08:00
cnauroth aee297ccea HADOOP-10181. GangliaContext does not work with multicast ganglia setup. Contributed by Andrew Johnson.
(cherry picked from commit 8004a00230)

Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java
2015-02-02 11:16:13 -08:00
Benoy Antony f3ed5b68ca HADOOP-11494. Lock acquisition on WrappedInputStream#unwrappedRpcBuffer may race with another thread. Contributed by Ted Yu.
(cherry picked from commit 3472e3bd6c)
2015-02-02 10:46:54 -08:00
Harsh J 648510e031 HADOOP-11488. Difference in default connection timeout for S3A FS. Contributed by Daisuke Kobayashi.
(cherry picked from commit ffc75d6ebe)
2015-02-01 00:17:24 +05:30
Gera Shegalov 151e147e64 HADOOP-11432. Fix SymlinkBaseTest#testCreateLinkUsingPartQualPath2. (Liang Xie via gera)
(cherry picked from commit 26c2de36e2)
2015-01-30 18:47:03 -08:00
Colin Patrick Mccabe 80381b62aa HADOOP-11498. Bump the version of HTrace to 3.1.0-incubating (Masatake Iwasaki via Colin P. McCabe)
(cherry picked from commit 09ad9a868a)
2015-01-30 16:02:36 -08:00
Kihwal Lee 3a01984bda HADOOP-9137. Support connection limiting in IPC server. Contributed by Kihwal Lee.
(cherry picked from commit 8dc59cb9e0)
2015-01-30 17:22:48 -06:00
cnauroth 4607ca2854 HADOOP-11523. StorageException complaining " no lease ID" when updating FolderLastModifiedTime in WASB. Contributed by Duo Xu.
(cherry picked from commit f2c91098c4)
2015-01-29 17:02:48 -08:00
Colin Patrick Mccabe e8d154baea HADOOP-11403. Avoid using sys_errlist on Solaris, which lacks support for it (Malcolm Kavalsky via Colin P. McCabe)
(cherry picked from commit e36ef3b402)
2015-01-29 15:48:59 -08:00
cnauroth fa2378d866 HADOOP-11441. Hadoop-azure: Change few methods scope to public. Contributed by Shashank Khandelwal.
(cherry picked from commit ad55083f75)
2015-01-29 13:07:59 -08:00
Akira Ajisaka 1081b4c4a7 HADOOP-9907. Webapp http://hostname:port/metrics link is not working. (aajisaka)
(cherry picked from commit 342efa110a)
2015-01-30 02:50:46 +09:00
Akira Ajisaka 7411c74b11 HADOOP-10574. Bump the maven plugin versions too -moving the numbers into properties. (aajisaka)
(cherry picked from commit 57b8950f37)

Conflicts:
	pom.xml
2015-01-30 02:27:36 +09:00