[med-svn] [fis-gtm] 02/03: Merge tag 'upstream/6.3-000A'
Amul Shah
tuskentower-guest at moszumanska.debian.org
Wed Dec 7 00:27:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
tuskentower-guest pushed a commit to branch master
in repository fis-gtm.
commit 10608d4f705c2ad7bb13cf1e814d73ab21dd6fd6
Merge: 8139f96 cd29d9f
Author: Amul Shah <amul.shah at fisglobal.com>
Date: Fri Oct 28 11:48:52 2016 -0400
Merge tag 'upstream/6.3-000A'
Upstream version 6.3-000A
Conflicts:
CMakeLists.txt
README
sr_i386/GTMDefinedTypesInitDebug.m
sr_i386/GTMDefinedTypesInitRelease.m
sr_i386/merrors_ansi.h
sr_i386/merrors_ctl.c
sr_linux/gtm_env_sp.csh
sr_linux/release_name.h
sr_port/anticipatory_freeze.h
sr_port/db_auto_upgrade.c
sr_port/dpgbldir.c
sr_port/gdsbt.h
sr_port/gdsdbver_sp.h
sr_port/gdsfhead.h
sr_port/mdef.h
sr_port/merrors.msg
sr_port/mu_extr_gblout.c
sr_port/mupip_backup.c
sr_port/mur_close_files.c
sr_port/mur_forward_play_cur_jrec.c
sr_port/mur_open_files.c
sr_port/op_zsystem.c
sr_port/resolve_ref.c
sr_port/t_end.c
sr_port/t_retry.c
sr_port/wbox_test_init.h
sr_port_cm/gtcml_lklist.c
sr_unix/buildaux.csh
sr_unix/buildaux_gde.csh
sr_unix/buildaux_gtmcrypt.csh
sr_unix/configure.gtc
sr_unix/db_ipcs_reset.c
sr_unix/dbcertify_deferred_signal_handler.c
sr_unix/dbcertify_signal_handler.c
sr_unix/dbinit_ch.c
sr_unix/deferred_signal_handler.c
sr_unix/do_semop.h
sr_unix/ftok_sem_incrcnt.c
sr_unix/ftok_sems.c
sr_unix/ftok_sems.h
sr_unix/gds_rundown.c
sr_unix/gtm_semutils.c
sr_unix/gtm_semutils.h
sr_unix/gtmcrypt.h
sr_unix/gtmrecv_end.c
sr_unix/gtmrecv_shutdown.c
sr_unix/gtmsource.c
sr_unix/gtmsource.h
sr_unix/gtmsource_readfiles.c
sr_unix/gtmsource_shutdown.c
sr_unix/gvcst_init_sysops.c
sr_unix/jnl_output_sp.c
sr_unix/jnlpool_init.c
sr_unix/kitstart.csh
sr_unix/mu_rndwn_file.c
sr_unix/mu_rndwn_repl_instance.c
sr_unix/mupip_cmd.c
sr_unix/mupip_rundown.c
sr_unix/pinentry-gtm.sh
sr_unix/recvpool_init.c
sr_unix/repl_inst_ftok_counter_halted.c
sr_unix/repl_inst_ftok_counter_halted.h
sr_unix/repl_instance.h
sr_unix/versions.csh
sr_unix/wait_for_disk_space.c
sr_unix_cm/gtcm_pkdisp.c
sr_x86_64/GTMDefinedTypesInitDebug.m
sr_x86_64/GTMDefinedTypesInitRelease.m
sr_x86_64/merrors_ansi.h
sr_x86_64/merrors_ctl.c
CMakeLists.txt | 6 +-
README | 14 +-
sr_i386/GTMDefinedTypesInitDebug.m | 345 ++-
sr_i386/GTMDefinedTypesInitRelease.m | 345 ++-
sr_i386/cmerrors_ctl.c | 12 +-
sr_i386/cmierrors_ctl.c | 50 +-
sr_i386/gdeerrors_ctl.c | 168 +-
sr_i386/merrors_ansi.h | 1 +
sr_i386/merrors_ctl.c | 2882 ++++++++++----------
sr_linux/gtm_env_sp.csh | 46 +-
sr_linux/release_name.h | 10 +-
sr_port/anticipatory_freeze.h | 27 +-
sr_port/db_auto_upgrade.c | 6 +-
sr_port/dbcertify_certify_phase.c | 3 +
sr_port/dfa_calc.c | 141 +-
sr_port/dpgbldir.c | 35 +-
sr_port/dpgbldir.h | 4 +-
sr_port/dse_dmp_fhead.c | 3 +
sr_port/emit_code.c | 3 +
sr_port/expritem.c | 6 +-
sr_port/ext2jnl.c | 2 +
sr_port/f_zchar.c | 3 +-
sr_port/gbldefs.c | 2 +-
sr_port/gds_blk_upgrade.h | 6 +-
sr_port/gdsbt.h | 5 +-
sr_port/gdsdbver_sp.h | 3 +-
sr_port/gdsfhead.h | 24 +-
sr_port/gtm_malloc_src.h | 2 +-
sr_port/gtm_string.h | 3 +-
sr_port/gvcst_blk_build.c | 9 +-
sr_port/gvcst_init.c | 14 +-
sr_port/m_write.c | 3 +-
sr_port/mdef.h | 32 +-
sr_port/merrors.msg | 1 +
sr_port/mprof_funcs.c | 24 +-
sr_port/msg.m | 2 +-
sr_port/mu_extr_gblout.c | 23 +-
sr_port/mubclnup.c | 4 +
sr_port/mupip_backup.c | 42 +-
sr_port/mur_close_files.c | 39 +-
sr_port/mur_forward_play_cur_jrec.c | 26 +-
sr_port/mur_open_files.c | 9 +-
sr_port/mur_output_record.c | 31 +-
sr_port/op_fnfnumber.c | 16 +-
sr_port/op_fnview.c | 2 +-
sr_port/op_gvextnam.c | 8 +-
sr_port/op_lock2.c | 36 +-
sr_port/op_lvpatwrite.c | 4 +-
sr_port/op_lvzwrite.c | 4 +-
sr_port/op_newintrinsic.c | 9 +-
sr_port/op_tcommit.c | 10 +-
sr_port/op_view.c | 10 +-
sr_port/op_zsystem.c | 52 +-
sr_port/opcode_def.h | 3 +-
sr_port/patcode.h | 23 +-
sr_port/patmaskseq.c | 8 +-
sr_port/patstr.c | 419 ++-
sr_port/put_lit.c | 2 +
sr_port/put_str.c | 4 +-
sr_port/resolve_ref.c | 21 +-
sr_port/set_gbuff_limit.c | 42 +
.../release_name.h => sr_port/set_gbuff_limit.h | 20 +-
sr_port/t_end.c | 121 +-
sr_port/t_retry.c | 2 +
sr_port/unw_mv_ent.c | 8 +-
sr_port/updproc.c | 3 +
sr_port/wbox_test_init.h | 7 +-
sr_port_cm/gtcm_protocol.c | 42 +-
sr_port_cm/gtcml_lklist.c | 3 +-
sr_unix/Makefile.mk | 4 +
sr_unix/buildaux.csh | 9 +-
sr_unix/buildaux_gde.csh | 3 +-
sr_unix/buildaux_gtmcrypt.csh | 13 +-
sr_unix/cms_load.csh | 5 +-
sr_unix/configure.gtc | 14 +-
sr_unix/db_ipcs_reset.c | 34 +-
sr_unix/dbcertify_cmd.c | 6 +-
sr_unix/dbcertify_deferred_signal_handler.c | 47 +-
sr_unix/dbcertify_signal_handler.c | 9 +-
sr_unix/dbinit_ch.c | 29 +-
sr_unix/deferred_signal_handler.c | 41 +-
sr_unix/dm_read.c | 11 +-
sr_unix/do_semop.h | 11 -
sr_unix/dse_cmd.c | 53 +-
sr_unix/exttab_parse.c | 94 +-
sr_unix/f_char.c | 3 +-
sr_unix/filestruct.h | 19 +-
..._signal_handler.c => forced_exit_err_display.c} | 48 +-
sr_unix/forced_exit_err_display.h | 18 +
sr_unix/ftok.c | 5 +-
sr_unix/ftok_sem_incrcnt.c | 7 +-
sr_unix/ftok_sems.c | 6 +-
sr_unix/ftok_sems.h | 2 +-
sr_unix/gds_rundown.c | 12 +-
sr_unix/gdsfilext.c | 8 +
sr_unix/gtm_env_init_sp.c | 15 +
sr_unix/gtm_exit_handler.c | 18 +-
sr_unix/gtm_logicals.h | 3 +-
sr_unix/gtm_semutils.c | 38 +-
sr_unix/gtm_semutils.h | 12 +-
sr_unix/gtmcrypt.h | 5 +-
sr_unix/gtmrecv_end.c | 10 +-
sr_unix/gtmrecv_shutdown.c | 9 +-
sr_unix/gtmsource.c | 4 +-
sr_unix/gtmsource.h | 3 +-
sr_unix/gtmsource_end.c | 11 +-
sr_unix/gtmsource_readfiles.c | 4 -
sr_unix/gtmsource_shutdown.c | 4 +-
sr_unix/gtmsrc.csh | 118 +-
sr_unix/gtmthreadgblasm.m | 4 +-
sr_unix/gvcst_init_sysops.c | 97 +-
sr_unix/iormdef.h | 4 +
sr_unix/jnl_output_sp.c | 6 +-
sr_unix/jnlpool_init.c | 37 +-
sr_unix/joberr.h | 62 +-
sr_unix/kitstart.csh | 16 +-
sr_unix/list_file.c | 8 +-
sr_unix/lke_cmd.c | 6 +-
sr_unix/mu_rndwn_file.c | 105 +-
sr_unix/mu_rndwn_repl_instance.c | 104 +-
sr_unix/mu_rndwn_replpool.c | 9 +-
sr_unix/mu_size_arsample.c | 2 +-
sr_unix/mu_size_impsample.c | 2 +-
sr_unix/mubfilcpy.c | 12 +-
sr_unix/mumps_clitab.c | 4 +-
sr_unix/mupip_cmd.c | 136 +-
sr_unix/mupip_rundown.c | 47 +-
sr_unix/pinentry-gtm.sh | 21 +-
sr_unix/recvpool_init.c | 16 +-
sr_unix/repl_inst_dump.c | 3 +
sr_unix/repl_inst_ftok_counter_halted.c | 40 +-
sr_unix/repl_inst_ftok_counter_halted.h | 28 +-
sr_unix/repl_instance.c | 26 +-
sr_unix/repl_instance.h | 9 +-
sr_unix/repl_ipc_cleanup.c | 21 +-
sr_unix/repl_sem.c | 2 +-
sr_unix/runall.csh | 4 +-
sr_unix/setactive.csh | 11 +-
sr_unix/setactive1.csh | 17 +-
sr_unix/trigger_cmd.c | 8 +-
sr_unix/versions.csh | 4 +-
sr_unix/wait_for_disk_space.c | 5 +-
sr_unix/wcs_wtstart.c | 4 +-
sr_unix_cm/gtcm_pkdisp.c | 13 +-
sr_unix_cm/gtcm_prsopt.c | 34 +-
sr_unix_gnp/gtcm_gnp_clitab.c | 4 +-
sr_x86_64/GTMDefinedTypesInitDebug.m | 361 ++-
sr_x86_64/GTMDefinedTypesInitRelease.m | 361 ++-
sr_x86_64/cmerrors_ctl.c | 12 +-
sr_x86_64/cmierrors_ctl.c | 50 +-
sr_x86_64/gdeerrors_ctl.c | 168 +-
sr_x86_64/merrors_ansi.h | 1 +
sr_x86_64/merrors_ctl.c | 2882 ++++++++++----------
153 files changed, 5331 insertions(+), 5495 deletions(-)
diff --cc sr_port/op_fnfnumber.c
index b7cdb9d,3768fd1..3768fd1
mode 100755,100644..100755
--- a/sr_port/op_fnfnumber.c
+++ b/sr_port/op_fnfnumber.c
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git
More information about the debian-med-commit
mailing list