Change 16029
C. Thomas Tyler
committed this change
into
/
Request Review
Download .zip
Routine merge to dev from main using:
p4 merge -b perforce_software-sdp-dev
Files
133
Comments
0
130
edited
3
added
0
deleted
•
guest/perforce_software/sdp/dev/LICENSE#2
Loading...
guest/perforce_software/sdp/dev/Maintenance/accessdates.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/addusertogroup.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/checkusers.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/checkusers_not_in_group.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/clean_protect.py#4
Loading...
guest/perforce_software/sdp/dev/Maintenance/countrevs.py#4
Loading...
guest/perforce_software/sdp/dev/Maintenance/creategroups.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/createusers.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/del_shelve.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/delusers.py#4
Loading...
guest/perforce_software/sdp/dev/Maintenance/describe_shelves.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/email.bat#4
Loading...
guest/perforce_software/sdp/dev/Maintenance/email.sh#4
Loading...
guest/perforce_software/sdp/dev/Maintenance/email_pending_client_deletes.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/email_pending_user_deletes.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/group_audit.py#3
Loading...
guest/perforce_software/sdp/dev/Maintenance/maintain_user_from_groups.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/maintenance#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/make_email_list.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/mirroraccess.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/p4deleteuser.py#7
Loading...
guest/perforce_software/sdp/dev/Maintenance/protect_groups.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/proxysearch.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/pymail.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/remove_empty_pending_changes.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/remove_jobs.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/removeuserfromgroups.py#6
Loading...
guest/perforce_software/sdp/dev/Maintenance/removeusersfromgroup.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/setpass.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/totalusers.py#4
Loading...
guest/perforce_software/sdp/dev/Maintenance/unload_clients.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/unload_clients_with_delete.py#4
Loading...
guest/perforce_software/sdp/dev/Maintenance/unload_labels.py#5
Loading...
guest/perforce_software/sdp/dev/Maintenance/update-changes.py#5
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/1/bin/p4d_1#2
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/2013.3_replica_upgrade.sh#7
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/2013.3_upgrade.sh#7
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/backup_functions.sh#16
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/daily_backup.sh#11
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/edge_shelf_replicate.sh#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/gen_default_broker_cfg.sh#7
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/kill_idle.sh#5
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/live_checkpoint.sh#8
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/mirror_ldap_groups.pl#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/p4broker_base#6
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/p4d_base#6
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/p4ftpd_base#5
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/p4login#6
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/p4master_run#5
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/p4p_base#6
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/p4pcm.pl#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/p4review.py#10
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/p4verify.sh#9
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/p4web_base#5
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/ps_functions.sh#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/recover_edge.sh#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/replica_cleanup.sh#5
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/replica_status.sh#6
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/sdp_sync.sh#8
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/svclogin.sh#5
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/sync_replica.sh#9
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/template.pl#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/template.py#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/template.sh#5
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/AD_auth.pl#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/AD_auth_debug.pl#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/AD_ssl_auth.pl#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/AD_ssl_auth_debug.pl#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/PreventWsNonAscii.py#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/SetCFOptions-forced.py#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/SetCFOptions.py#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/SetDefaultDepotSpecMapField.py#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/SetLabelOptions.py#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/SetWsOptions.py#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/SetWsOptionsAndView.py#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/TFSJobCheck.py#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/authCheckTrigger.py#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/block_p4exp.py#2
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/command_block.py#2
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/keep_group_unset.py#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/submit_form_1.py#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/triggers/submit_form_1_in.py#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/update_limits.py#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/upgrade.sh#8
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/weekly_backup.sh#11
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/bin/weekly_sync_replica.sh#10
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/config/p4_vars.template#10
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/etc/init.d/p4broker_instance_init.template#7
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/etc/init.d/p4d_instance_init.template#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/etc/init.d/p4dtg_instance_init.template#2
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/etc/init.d/p4ftpd_instance_init.template#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/etc/init.d/p4p_instance_init.template#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/etc/init.d/p4web_instance_init.template#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/lib/Cmd.pm#2
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/lib/MinJIRA.pm#2
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/lib/MinP4.pm#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/lib/Misc.pm#2
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/lib/Msg.pm#2
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/lib/OS.pm#2
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/lib/libcore.sh#4
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/lib/libp4u.sh#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/lib/p4u_env.sh#3
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/test/get_JIRA_issue_status.pl#2
Loading...
guest/perforce_software/sdp/dev/Server/Unix/p4/common/test/test_utils.sh#2
Loading...
guest/perforce_software/sdp/dev/Server/Unix/setup/install_sdp_perl.sh#5
Loading...
guest/perforce_software/sdp/dev/Server/Unix/setup/install_sdp_python.sh#7
Loading...
guest/perforce_software/sdp/dev/Server/Unix/setup/mkdirs.sh#18
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/2013.3_upgrade.bat#6
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/daily_backup.bat#4
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/live_checkpoint.bat#4
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/p4env.bat#4
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/p4login.bat#2
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/p4verify.bat#2
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/p4verify_incremental.bat#2
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/parse_config_ini.bat#2
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/remove_old_checkpoints.bat#3
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/remove_old_logs.bat#3
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/replica_status.bat#4
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/run_p4review.cmd#2
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/sync_replica.bat#2
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/triggers/ad-auth-check.ps1#2
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/upgrade.bat#8
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/weekly_backup.bat#4
Loading...
guest/perforce_software/sdp/dev/Server/Windows/p4/common/bin/weekly_sync_replica.bat#2
Loading...
guest/perforce_software/sdp/dev/Server/Windows/setup/SDPEnv.py#5
Loading...
guest/perforce_software/sdp/dev/Server/Windows/setup/report_env.py#2
Loading...
guest/perforce_software/sdp/dev/Server/Windows/setup/template_configure_new_server.bat#2
Loading...
guest/perforce_software/sdp/dev/Server/setup/configure_new_server.bat#6
Loading...
guest/perforce_software/sdp/dev/Server/setup/configure_new_server.sh#9
Loading...
guest/perforce_software/sdp/dev/doc/DR-Failover-steps-Unix-standby.odt#1
Loading...
guest/perforce_software/sdp/dev/doc/DR-Failover-steps-Unix-standby.pdf#1
Loading...
guest/perforce_software/sdp/dev/test/.p4ignore#1
Loading...
Tip: Use
n
and
p
to cycle through the changes.