You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2019/07/01 06:00:40 UTC
[incubator-iotdb] branch master updated (bf272d6 -> 10e4b4e)
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from bf272d6 Merge pull request #213 from apache/xingtanzjr_update_travis
add b88fa61 fix system memory check in iotdb-env.sh
add 35fc676 set the hadoop-module logback level as info
add 044fcce Merge branch 'master' into fix_memorycheck_in_startsh
new 10e4b4e Merge pull request #211 from apache/fix_memorycheck_in_startsh
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
{iotdb => hadoop}/src/test/resources/logback.xml | 0
iotdb/iotdb/conf/iotdb-env.sh | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
copy {iotdb => hadoop}/src/test/resources/logback.xml (100%)
[incubator-iotdb] 01/01: Merge pull request #211 from
apache/fix_memorycheck_in_startsh
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 10e4b4e18dd617f0ab80a0c534cc88d0fa8e9875
Merge: bf272d6 044fcce
Author: Zhang.Jinrui <xi...@163.com>
AuthorDate: Mon Jul 1 14:00:35 2019 +0800
Merge pull request #211 from apache/fix_memorycheck_in_startsh
fix system memory check in iotdb-env.sh
hadoop/src/test/resources/logback.xml | 41 +++++++++++++++++++++++++++++++++++
iotdb/iotdb/conf/iotdb-env.sh | 2 +-
2 files changed, 42 insertions(+), 1 deletion(-)