[incubator-iotdb] branch mem_control updated (d9d8722 -> 73e1625)

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a change to branch mem_control
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from d9d8722  Merge branch 'mem_control' of https://github.com/apache/incubator-iotdb into mem_control
     new 160b9a5  SystemInfo 1
     new 61d982b  systeminfo
     new b0bb3c5  fix conflict
     new 6655953  buffered array threshold
     new cf5d230  complete system info
     new 337e3d6  Merge branch 'mem_control' of https://github.com/apache/incubator-iotdb into mem_control
     new 660c107  full complete system info part
     new 045b802  Merge branch 'mem_control' of https://github.com/apache/incubator-iotdb into mem_control
     new bcf5797  fix typo
     new 73e1625  Merge pull request #1581 from Alima777/mem_control

The 3917 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:
 .../java/org/apache/iotdb/db/rescon/PrimitiveArrayManager.java   | 2 +-
 server/src/main/java/org/apache/iotdb/db/rescon/SystemInfo.java  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)