# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#4 | 16784 | C. Thomas Tyler |
Routine Merge Down to dev from main using: p4 -s merge -n -b perforce_software-sdp-dev |
||
#3 | 16029 | C. Thomas Tyler |
Routine merge to dev from main using: p4 merge -b perforce_software-sdp-dev |
||
#2 | 12923 | C. Thomas Tyler |
Routine merge down from main to dev. Resolved with 'p4 resolve -as', no merges or conflicts. |
||
#1 | 12245 | C. Thomas Tyler | Routine merge down from main. | ||
//guest/perforce_software/sdp/main/Server/Unix/p4/common/bin/triggers/authCheckTrigger.py | |||||
#1 | 12173 | Russell C. Jackson (Rusty) |
Python ldap/ad authentication script. This uses simple bind, so it is easier to use than the Perl version. |