Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,444 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

723 Commits

Author SHA1 Message Date
Jason Lowe 4703f5d20b YARN-5641. Localizer leaves behind tarballs after container is complete. Contributed by Eric Badger 2017-01-27 15:25:57 +00:00
Jason Lowe b806201f0a Revert "YARN-5641. Localizer leaves behind tarballs after container is complete. Contributed by Eric Badger" 
This reverts commit 45407acaed.
 2017-01-26 14:42:22 +00:00
Jason Lowe 45407acaed YARN-5641. Localizer leaves behind tarballs after container is complete. Contributed by Eric Badger 
(cherry picked from commit 9e19f758c1)
 2017-01-25 21:54:17 +00:00
Junping Du 8027c3e8b9 YARN-6099. Improve webservice to list aggregated log files. Contributed by Xuan Gong. 2017-01-24 15:28:52 -08:00
Jason Lowe 1672a06135 YARN-5547. NMLeveldbStateStore should be more tolerant of unknown keys. Contributed by Ajith S 2017-01-24 16:19:02 +00:00
Chris Nauroth 5251de00fa YARN-5456. container-executor support for FreeBSD, NetBSD, and others if conf path is absolute. Contributed by Allen Wittenauer. 
(cherry picked from commit b913677365)
 2017-01-19 20:48:27 +05:30
Chris Nauroth 198bd84b33 YARN-5121. fix some container-executor portability issues. Contributed by Allen Wittenauer. 
(cherry picked from commit ef501b1a0b)
 2017-01-19 20:48:27 +05:30
Subru Krishnan fb639aed90 YARN-6016. Fix minor bugs in handling of local AMRMToken in AMRMProxy. (Botong Huang via Subru). 
(cherry picked from commit 4d1f3d9020)
 2017-01-17 14:51:27 -08:00
Daniel Templeton 718ae2d477 YARN-5849. Automatically create YARN control group for pre-mounted cgroups (Contributed by Miklos Szegedi via Daniel Templeton) 
(cherry picked from commit 0fffebe51a91023c4949ab560f5c828f1b568072)
 2017-01-11 15:36:18 -08:00
Junping Du ba6a013341 YARN-6079. Fix simple spelling errors in yarn test code. Contributed by vijay. 
(cherry picked from commit 4db119b7b5)
 2017-01-10 18:22:45 -08:00
Naganarasimha ea38256fab YARN-6015. AsyncDispatcher thread name can be set to improved debugging. Contributed by Ajith S. 2017-01-10 15:10:54 +05:30
Varun Saxena 4fab250fc0 YARN-6068. Log aggregation get failed when NM restart even with recovery (Junping Du via Varun Saxena) 
(cherry picked from commit f59e36b4ce)
 2017-01-09 11:31:39 +05:30
Arun Suresh 4985217de4 YARN-6066. Opportunistic containers Minor fixes : API annotations, parameter name changes, checkstyles. (asuresh) 2017-01-08 08:27:10 -08:00
Arun Suresh 81da7d1d30 YARN-5938. Refactoring OpportunisticContainerAllocator to use SchedulerRequestKey instead of Priority and other misc fixes (asuresh) 
(cherry picked from commit ac1e5d4f77)
 2017-01-06 11:25:49 -08:00
Arun Suresh 2b4d3e8506 YARN-5646. Add documentation and update config parameter names for scheduling of OPPORTUNISTIC containers. (Konstantinos Karanasos via asuresh) 
(cherry picked from commit 2273a74c1f)
(cherry picked from commit 9e17ffe599e12c59c48f4355de645c31a4735d04)
 2017-01-06 11:15:10 -08:00
Arun Suresh 3d3bb30a25 YARN-5982. Simplify opportunistic container parameters and metrics. (Konstantinos Karanasos via asuresh) 
(cherry picked from commit b0aace21b1)
(cherry picked from commit 3faa0b0d682687099b253feee9b41340edef7111)
 2017-01-06 11:15:09 -08:00
Arun Suresh 368565f0ce YARN-4597. Introduce ContainerScheduler and a SCHEDULED state to NodeManager container lifecycle. (asuresh) 
(cherry picked from commit 3219b7b4ac)
(cherry picked from commit 49921678858a17ca58ca2ae704ced1ff584e0859)
 2017-01-06 11:15:09 -08:00
Arun Suresh 047772f15f YARN-5823. Update NMTokens in case of requests with only opportunistic containers. (Konstantinos Karanasos via asuresh) 
(cherry picked from commit 283fa33feb)
(cherry picked from commit 1c4cc88a754ac9f557cdc8c859b8aadec19a5067)
 2017-01-06 11:15:09 -08:00
Arun Suresh 0e60c7cd33 YARN-5377. Fix TestQueuingContainerManager.testKillMultipleOpportunisticContainers. (Konstantinos Karanasos via asuresh) 
(cherry picked from commit f38a6d03a1)
(cherry picked from commit 83ccab8a653a4ef943276651c9604bd434675980)
 2017-01-06 11:15:09 -08:00
Arun Suresh 7437252102 YARN-2995. Enhance UI to show cluster resource utilization of various container Execution types. (Konstantinos Karanasos via asuresh) 
(cherry picked from commit 0aafc122d4)
(cherry picked from commit 25598b6e7118bacd33a167fb496e9cda5e9f9ad0)
 2017-01-06 11:15:09 -08:00
Arun Suresh 28f3bb38bf YARN-5799. Fix Opportunistic Allocation to set the correct value of Node Http Address. (asuresh) 
(cherry picked from commit aa3cab1eb2)
(cherry picked from commit ce10e98826884245e733431297d0275177965f17)
 2017-01-06 11:15:09 -08:00
Arun Suresh f9ea753414 YARN-5486. Update OpportunisticContainerAllocatorAMService::allocate method to handle OPPORTUNISTIC container requests. (Konstantinos Karanasos via asuresh) 
(cherry picked from commit 10be45986c)
(cherry picked from commit e3baa0988b4dfb592afe426ffeba3c7091b271c5)
 2017-01-06 11:15:09 -08:00
Junping Du dc2e44e8f8 YARN-5923. Unable to access logs for a running application if YARN_ACL_ENABLE is enabled. Contributed by Xuan Gong. 
(cherry picked from commit 8fadd69047)
 2017-01-03 15:19:36 -08:00
Robert Kanter 88597991b0 YARN-5257. Fix unreleased resources and null dereferences (yufeigu via rkanter) 
(cherry picked from commit 9262797e86)
 2016-12-27 14:14:41 -08:00
Junping Du cc42dbb703 YARN-4990. Re-direction of a particular log file within in a container in NM UI does not redirect properly. Contributed by Xuan Gong. 
(cherry picked from commit 736f54b727)
 2016-12-21 14:16:19 -08:00
Robert Kanter 9cba7c6d71 YARN-5963. Spelling errors in logging and exceptions for node manager, client, web-proxy, common, and app history code (gsohn via rkanter) 
(cherry picked from commit 72fe546841)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
 2016-12-07 15:09:37 -08:00
Naganarasimha 2d94f938c5 YARN-4330. MiniYARNCluster is showing multiple Failed to instantiate default resource calculator warning messages. Contributed by Varun Saxena 
(cherry picked from commit 3541ed8068)
 2016-11-23 14:14:56 +05:30
Jason Lowe 38024eb8f7 YARN-5859. TestResourceLocalizationService#testParallelDownloadAttemptsForPublicResource sometimes fails. Contributed by Eric Badger 
(cherry picked from commit 009452bb6d)
 2016-11-21 16:37:59 +00:00
Jason Lowe 46b7d6233c YARN-5836. Malicious AM can kill containers of other apps running in any node its containers are running. Contributed by Botong Huang 
(cherry picked from commit 59bfcbf357)
 2016-11-16 22:25:15 +00:00
Mingliang Liu 4e0fcff8ab HADOOP-13427. Eliminate needless uses of FileSystem#{exists(), isFile(), isDirectory()}. Contributed by Steve Loughran and Mingliang Liu 
(cherry picked from commit 5af572b644)
 2016-11-15 11:36:08 -08:00
Naganarasimha 260f3a9dc9 YARN-4355. NPE while processing localizer heartbeat. Contributed by Varun Saxena & Jonathan Hung. 
(cherry picked from commit 7ffb9943b8)
 2016-11-15 15:44:25 +05:30
Naganarasimha 7e9a6b653e Reverting the patch due to the issue raised in YARN-5765 
Revert "YARN-5287. LinuxContainerExecutor fails to set proper permission. Contributed by Ying Zhang."

This reverts commit 93b768d0d1.
 2016-11-15 11:05:03 +05:30
Karthik Kambatla f4c8dc4783 YARN-5834. TestNodeStatusUpdater.testNMRMConnectionConf compares nodemanager wait time to the incorrect value. (Chang Li via kasha) 
(cherry picked from commit 3a98419532)
 2016-11-10 14:09:33 -08:00
Jian He a422740bd7 YARN-5611. Provide an API to update lifetime of an application. Contributed by Rohith Sharma K S 2016-11-09 16:39:46 -08:00
Andrew Wang 4f25fd975e HADOOP-13789. Hadoop Common includes generated test protos in both jar and test-jar. Contributed by Sean Busbey. 
(cherry picked from commit e1c6ef2efa)
 2016-11-08 16:33:58 -08:00
Jason Lowe 8bb264c70d YARN-5356. NodeManager should communicate physical resource capability to ResourceManager. Contributed by Inigo Goiri 
(cherry picked from commit 3f93ac0733)

Conflicts:

	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/ContainersMonitorImpl.java
 2016-11-08 22:16:53 +00:00
Varun Vasudev 7676b89f43 YARN-5822. Log ContainerRuntime initialization error in LinuxContainerExecutor. Contributed by Sidharta Seethana. 
(cherry picked from commit 9ee0e3172e)
 2016-11-03 22:34:38 +05:30
Jason Lowe f8d653ef34 YARN-5001. Aggregated Logs root directory is created with wrong group if nonexistent. Contributed by Haibo Chen 
(cherry picked from commit 76893a4100)
 2016-11-01 20:24:22 +00:00
Varun Saxena 2f0a101ab9 YARN-5805. Add isDebugEnabled check for debug logs in nodemanager (Bibin A Chundatt via Varun Saxena) 2016-11-01 16:23:12 +05:30
Daniel Templeton 9d13a13160 YARN-5793. Trim configuration values in DockerLinuxContainerRuntime (Contributed by Tianyin Xu via Daniel Templeton) 
(cherry picked from commit f3eb4c3c73)
 2016-10-31 14:01:15 -07:00
Jason Lowe ea9a1be109 YARN-5767. Fix the order that resources are cleaned up from the local Public/Private caches. Contributed by Chris Trezzo 
(cherry picked from commit 1b79c417dc)
 2016-10-28 15:59:57 +00:00
Jason Lowe 2ab80a148a YARN-5027. NM should clean up app log dirs after NM restart. Contributed by sandflee 
(cherry picked from commit 7146359bfd)
 2016-10-28 15:49:54 +00:00
Jason Lowe 0f224d405f HADOOP-13770. Shell.checkIsBashSupported swallowed an interrupted exception. Contributed by Wei-Chiu Chuang 
(cherry picked from commit c017171da0)
 2016-10-28 15:06:23 +00:00
Jason Lowe e50215306d YARN-4831. Recovered containers will be killed after NM stateful restart. Contributed by Siqi Li 
(cherry picked from commit 7e3c327d31)
 2016-10-27 20:44:17 +00:00
Robert Kanter b7f7d42c27 YARN-4456. Clean up Lint warnings in nodemanager (templedf via rkanter) 
(cherry picked from commit 6fbfb501f2)
 2016-10-27 12:37:20 -07:00
Varun Saxena 65c009ca00 YARN-5686. DefaultContainerExecutor random working dir algorigthm skews results (Vrushali C via Varun Saxena) 2016-10-27 14:03:02 +05:30
Varun Saxena daf9a656b9 YARN-5752. TestLocalResourcesTrackerImpl#testLocalResourceCache times out (Eric Badger via Varun Saxena) 2016-10-27 13:46:13 +05:30
Rohith Sharma K S 07b531c10a YARN-4555. TestDefaultContainerExecutor#testContainerLaunchError fails on non-english locale environment. Contributed by Takashi Ohnishi. 
(cherry picked from commit b110c4b5e8)
 2016-10-27 11:35:38 +05:30
Karthik Kambatla e4ba92abee YARN-5388. Deprecate and remove DockerContainerExecutor. (Daniel Templeton via kasha) 2016-10-25 15:26:27 -07:00
Robert Kanter e02c756f16 YARN-5466. DefaultContainerExecutor needs JavaDocs (templedf via rkanter) 
(cherry picked from commit f5d9235914)
 2016-10-17 14:29:42 -07:00
Chris Douglas f0f2681b4f YARN-5717. Add tests for container-executor is_feature_enabled. Contributed by Sidharta Seethana 
(cherry picked from commit cf3f43e95b)
 2016-10-13 20:49:50 -07:00
Varun Vasudev 3ce02387ea YARN-5704. Provide config knobs to control enabling/disabling new/work in progress features in container-executor. Contributed by Sidharta Seethana. 
(cherry picked from commit 0992708d79)
 2016-10-05 15:32:50 +05:30
Varun Vasudev 3f1d3e3177 YARN-5662. Provide an option to enable ContainerMonitor. Contributed by Jian He. 
(cherry picked from commit bc2656f09f)
 2016-09-28 15:27:09 +05:30
Arun Suresh 7484d0b1b9 YARN-5609. Expose upgrade and restart API in ContainerManagementProtocol. Contributed by Arun Suresh 2016-09-26 23:55:13 +08:00
Arun Suresh dfaac56433 YARN-5637. Changes in NodeManager to support Container rollback and commit. (asuresh) 
(cherry picked from commit 3552c2b99d)
 2016-09-18 11:06:38 -07:00
Arun Suresh 00759f50be YARN-5657. Fix TestDefaultContainerExecutor. (asuresh) 
(cherry picked from commit f67237cbe7)
 2016-09-17 09:32:55 -07:00
Naganarasimha 20729ead91 YARN-5642. Typos in 9 log messages. Contributed by Mehran Hassani 2016-09-17 10:37:42 +05:30
Arun Suresh 16aecc699d YARN-5620. Core changes in NodeManager to support re-initialization of Containers with new launchContext. (asuresh) 
(cherry picked from commit 40b5a59b72)
 2016-09-15 08:11:14 -07:00
Jason Lowe 4f2f0eb0bb YARN-5630. NM fails to start after downgrade from 2.8 to 2.7. Contributed by Jason Lowe 
(cherry picked from commit e793309735)
 2016-09-13 14:43:21 +00:00
Varun Vasudev ec3a651b17 YARN-5576. Allow resource localization while container is running. Contributed by Jian He. 2016-09-06 20:07:54 +05:30
Varun Vasudev 34f9330651 YARN-5596. Fix failing unit test in TestDockerContainerRuntime. Contributed by Sidharta Seethana. 
(cherry picked from commit 08f55ccbb0)
 2016-09-01 14:10:18 +05:30
Arun Suresh b279f42d79 YARN-5221. Expose UpdateResourceRequest API to allow AM to request for change in container properties. (asuresh) 
(cherry picked from commit d6d9cff21b)
 2016-08-30 16:33:31 -07:00
Karthik Kambatla d9b42248de YARN-5373. NPE listing wildcard directory in containerLaunch. (Daniel Templeton via kasha) 
(cherry picked from commit cde3a00526)
 2016-08-26 11:08:16 -07:00
Junping Du af1502fcab YARN-5557. Add localize API to the ContainerManagementProtocol. Contributed by Jian He. 
(cherry picked from commit 9ef632f3b0)
 2016-08-26 09:05:33 -07:00
Varun Vasudev 49a97a76f5 YARN-5430. Return container's ip and host from NM ContainerStatus call. Contributed by Jian He. 2016-08-26 16:33:21 +05:30
Varun Vasudev 952c309dd9 YARN-5042. Mount /sys/fs/cgroup into Docker containers as read only mount. Contributed by luhuichun. 
(cherry picked from commit 42d9876471ff0bf0ea240cd48fe483cda8aa1ec7)
 2016-08-25 14:18:12 +05:30
Arun Suresh bd348d20b2 Revert "YARN-5049. Extend NMStateStore to save queued container information. (Konstantinos Karanasos via asuresh)" 
This reverts commit 307cda70db.
 2016-08-24 10:23:06 -07:00
Varun Vasudev 3ee1fb774e YARN-5455. Update Javadocs for LinuxContainerExecutor. Contributed by Daniel Templeton. 
(cherry picked from commit 7f05ff7a4e)
 2016-08-17 15:35:23 +05:30
Ray Chiang 372f6f8456 YARN-5137. Make DiskChecker pluggable in NodeManager. (Yufei Gu via rchiang) 
(cherry picked from commit dbe9e70cc084220ea1f68da850cdb092281b5e96)
 2016-08-10 19:26:49 -07:00
Varun Vasudev c599f6215e YARN-5394. Remove bind-mount /etc/passwd for Docker containers. Contributed by Zhankun Tang. 
(cherry picked from commit 522ddbde79)
 2016-08-09 16:05:03 +05:30
Arun Suresh 5f7edb79d1 YARN-5457. Refactor DistributedScheduling framework to pull out common functionality. (asuresh) 
(cherry picked from commit 82c9e06101)
 2016-08-09 00:46:08 -07:00
Naganarasimha 93b768d0d1 YARN-5287. LinuxContainerExecutor fails to set proper permission. Contributed by Ying Zhang. 2016-08-09 06:48:39 +05:30
Varun Saxena ce8df272f4 YARN-4910. Fix incomplete log info in ResourceLocalizationService (Jun Gong via Varun Saxena) 2016-08-08 22:14:56 +05:30
Wangda Tan a73e118437 YARN-4888. Changes in scheduler to identify resource-requests explicitly by allocation-id. (Subru Krishnan via wangda) 
(cherry picked from commit 3f100d76ff)
 2016-08-05 10:44:07 -07:00
Varun Vasudev 19d894538d YARN-5459. Add support for docker rm. Contributed by Shane Kumpf. 
(cherry picked from commit 08e33381f5)
 2016-08-04 14:18:01 +05:30
Jason Lowe 1ea03411c2 YARN-5462. TestNodeStatusUpdater.testNodeStatusUpdaterRetryAndNMShutdown fails intermittently. Contributed by Eric Badger 
(cherry picked from commit db646540f0)
 2016-08-03 19:18:50 +00:00
Varun Vasudev 1087745d79 YARN-5460. Change container runtime type logging in DelegatingLinuxContainerRuntime to debug. Contributed by Shane Kumpf. 
(cherry picked from commit d848184e90)
 2016-08-03 12:03:31 +05:30
Varun Vasudev b63e6c8027 YARN-5458. Rename DockerStopCommandTest to TestDockerStopCommand. Contributed by Shane Kumpf. 
(cherry picked from commit 7fc70c6422)
 2016-08-02 17:02:17 +05:30
Varun Vasudev 4e5409a2bb YARN-5443. Add support for docker inspect command. Contributed by Shane Kumpf. 
(cherry picked from commit 2e7c2a13a8)
 2016-08-02 17:01:59 +05:30
Varun Vasudev 7ecb1635b4 YARN-5444. Fix failing unit tests in TestLinuxContainerExecutorWithMocks. Contributed by Yufei Gu. 
(cherry picked from commit 4455aa7c86a36b6e017e288479a7d4ced889faa0)
 2016-08-01 16:01:10 +05:30
Arun Suresh f197378f81 YARN-5113. Refactoring and other clean-up for distributed scheduling. (Konstantinos Karanasos via asuresh) 
(cherry picked from commit e5766b1dbe)
 2016-07-31 11:49:09 -07:00
Arun Suresh 586cd0daa1 YARN-5350. Distributed Scheduling: Ensure sort order of allocatable nodes returned by the RM is not lost. (asuresh) 
(cherry picked from commit 8fbe6ece24)
 2016-07-19 23:22:47 -07:00
Varun Saxena 8b0337b499 YARN-5383. Fix findbugs and checkstyle issues in ContainerExecutor. (Vrushali C via Varun Saxena) 2016-07-15 23:30:36 +05:30
Varun Vasudev d5d68d98c6 YARN-5303. Clean up ContainerExecutor JavaDoc. Contributed by Daniel Templeton. 
(cherry picked from commit 54bf14f80b)
 2016-07-14 19:32:09 +05:30
Varun Vasudev b4124c6a5a YARN-4759. Fix signal handling for docker containers. Contributed by Shane Kumpf. 
(cherry picked from commit e5e558b0a3)
 2016-07-14 19:32:00 +05:30
Varun Vasudev abfaf0e0e7 YARN-5298. Mount usercache and NM filecache directories into Docker container. Contributed by Sidharta Seethana. 
(cherry-picked from commit 58e1850801)
 2016-07-14 16:48:22 +05:30
Rohith Sharma K S 356c09a509 YARN-5299. Log Docker run command when container fails. Contributed by Varun Vasudev. 
(cherry picked from commit dbe97aa768)
 2016-07-14 11:49:48 +05:30
Jian He e94e6be772 YARN-5270. Solve miscellaneous issues caused by YARN-4844. Contributed by Wangda Tan 2016-07-11 22:37:52 -07:00
Vinod Kumar Vavilapalli c3d9ac82af YARN-5224. Added new web-services /containers/{containerid}/logs & /containers/{containerid}/logs/{filename} and using them in "yarn logs" CLI to get logs of finished containers of a running application. Contributed by Xuan Gong. 2016-07-06 14:19:16 -07:00
Jian He 46f8204992 YARN-5296. NMs going OutOfMemory because ContainerMetrics leak in ContainerMonitorImpl. Contributed by Junping Du 
(cherry picked from commit d792a90206)
 2016-07-05 18:06:03 -07:00
Vinod Kumar Vavilapalli 56a08983e2 YARN-5214. Fixed locking in DirectoryCollection to avoid hanging NMs when various code-paths hit slow disks. Contributed by Junping Du. 
(cherry picked from commit ce9c006430)
 2016-07-05 16:08:57 -07:00
Ray Chiang fb9327edae YARN-4568. Fix message when NodeManager runs into errors initializing the recovery directory. (rchiang) 
(cherry picked from commit 0a5def155e)
 2016-07-01 15:55:56 -07:00
Arun Suresh e64d21b297 YARN-5171. Extend DistributedSchedulerProtocol to notify RM of containers allocated by the Node. (Inigo Goiri via asuresh) 
(cherry picked from commit 99e5dd68d0)
 2016-06-22 19:05:28 -07:00
Sangjin Lee 2a79910c22 YARN-4958. The file localization process should allow for wildcards to reduce the application footprint in the state store (Daniel Templeton via sjlee) 
(cherry picked from commit 5107a967fa)
 2016-06-20 10:00:41 -07:00
Junping Du ea4cab2330 YARN-5246. NMWebAppFilter web redirects drop query parameters. Contributed by Varun Vasudev. 
(cherry picked from commit d0162f2040)
 2016-06-19 17:45:57 -07:00
Junping Du 6afa044dda YARN-5251. Yarn CLI to obtain App logs for last 'n' bytes fails. Contributed by Xuan Gong. 
(cherry picked from commit c35fa4a0e5)
 2016-06-17 08:25:33 -07:00
Junping Du 6dd34baf3c YARN-5237. Fix missing log files issue in rolling log aggregation. Contributed by Xuan Gong. 
(cherry picked from commit 5dfc38ff57)
 2016-06-15 16:20:07 -07:00
Wangda Tan 863bfa4d6a YARN-1942. Deprecate toString/fromString methods from ConverterUtils and move them to records classes like ContainerId/ApplicationId, etc. (wangda) 2016-06-14 15:12:00 -07:00
Arun Suresh f3c7a99e33 YARN-5212. Run existing ContainerManager tests using QueuingContainerManagerImpl. (Konstantinos Karanasos via asuresh) 
(cherry picked from commit 7dae2b3bc4)
 2016-06-12 10:06:18 -07:00
Vinod Kumar Vavilapalli f6cd1bcf89 YARN-5191. Renamed the newly added “download=true” option for getting logs via NMWebServices and AHSWebServices to be a better "format" option. (Xuan Gong via vinodkv) 
(cherry picked from commit 9378d9428f)
 2016-06-09 12:32:53 -07:00