diff options
| author | Hans Nilsson <[email protected]> | 2016-12-05 12:34:38 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-12-05 12:34:38 +0100 |
| commit | 8555139c761e35eee556f5f04f8b7a8c9e3d69b4 (patch) | |
| tree | 3197923e3ef4c944532e0e66c26f4a0d753f5235 | |
| parent | 79796f35cd7606718bf158f174c39271e4e5224d (diff) | |
| parent | 5dd6f8571567afe3fd0909118461ea3cfd293852 (diff) | |
| download | otp-8555139c761e35eee556f5f04f8b7a8c9e3d69b4.tar.gz otp-8555139c761e35eee556f5f04f8b7a8c9e3d69b4.tar.bz2 otp-8555139c761e35eee556f5f04f8b7a8c9e3d69b4.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/observer/src/cdv_ets_cb.erl | 7 | ||||
| -rw-r--r-- | lib/public_key/test/public_key.cover | 2 | ||||
| -rw-r--r-- | lib/ssh/test/ssh.cover | 1 |
3 files changed, 3 insertions, 7 deletions
diff --git a/lib/observer/src/cdv_ets_cb.erl b/lib/observer/src/cdv_ets_cb.erl index 52a90b093b..ddd2d42df6 100644 --- a/lib/observer/src/cdv_ets_cb.erl +++ b/lib/observer/src/cdv_ets_cb.erl @@ -34,10 +34,8 @@ -define(COL_NAME, ?COL_ID+1). -define(COL_SLOT, ?COL_NAME+1). -define(COL_OWNER, ?COL_SLOT+1). --define(COL_BUCK, ?COL_OWNER+1). --define(COL_OBJ, ?COL_BUCK+1). +-define(COL_OBJ, ?COL_OWNER+1). -define(COL_MEM, ?COL_OBJ+1). --define(COL_TYPE, ?COL_MEM+1). %% Callbacks for cdv_virtual_list_wx col_to_elem(id) -> col_to_elem(?COL_ID); @@ -45,8 +43,6 @@ col_to_elem(?COL_ID) -> #ets_table.id; col_to_elem(?COL_NAME) -> #ets_table.name; col_to_elem(?COL_SLOT) -> #ets_table.slot; col_to_elem(?COL_OWNER) -> #ets_table.pid; -col_to_elem(?COL_TYPE) -> #ets_table.data_type; -col_to_elem(?COL_BUCK) -> #ets_table.buckets; col_to_elem(?COL_OBJ) -> #ets_table.size; col_to_elem(?COL_MEM) -> #ets_table.memory. @@ -57,7 +53,6 @@ col_spec() -> {"Owner", ?wxLIST_FORMAT_CENTRE, 120}, {"Objects", ?wxLIST_FORMAT_RIGHT, 80}, {"Memory", ?wxLIST_FORMAT_RIGHT, 80} -% {"Type", ?wxLIST_FORMAT_LEFT, 50} ]. get_info(Owner) -> diff --git a/lib/public_key/test/public_key.cover b/lib/public_key/test/public_key.cover index ec00814578..6c46492bec 100644 --- a/lib/public_key/test/public_key.cover +++ b/lib/public_key/test/public_key.cover @@ -1,4 +1,4 @@ {incl_app,public_key,details}. -{excl_mods, public_key, ['OTP-PUB-KEY']}. +{excl_mods, public_key, ['OTP-PUB-KEY', 'PKCS-FRAME']}. diff --git a/lib/ssh/test/ssh.cover b/lib/ssh/test/ssh.cover index a4221fbbbe..69d2a1c4f8 100644 --- a/lib/ssh/test/ssh.cover +++ b/lib/ssh/test/ssh.cover @@ -1,2 +1,3 @@ {incl_app,ssh,details}. +{excl_mods, ssh, [ssh_dbg, ssh_info, ssh_server_key_api, ssh_sftpd_file_api]}.
\ No newline at end of file |