diff options
| author | Russ Allbery <eagle@eyrie.org> | 2014-07-16 13:46:50 -0700 |
|---|---|---|
| committer | Russ Allbery <eagle@eyrie.org> | 2014-07-16 13:46:50 -0700 |
| commit | 1796d631f0846ec98cd286bc4284898a7300ee78 (patch) | |
| tree | 6fd42de6dc858ef06c6d270410c32ec61f39e593 /.gitignore | |
| parent | f5194217566a6f4cdeffbae551153feb1412210d (diff) | |
| parent | 6409733ee3b7b1910dc1c166a392cc628834146c (diff) | |
Merge tag 'upstream/1.1' into debian
Upstream version 1.1
Conflicts:
NEWS
README
client/keytab.c
perl/lib/Wallet/ACL.pm
perl/sql/Wallet-Schema-0.08-PostgreSQL.sql
perl/t/general/admin.t
perl/t/verifier/ldap-attr.t
Change-Id: I1a1dc09b97c9258e61f1c8877d0837193c8ae2c6
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -9,15 +9,18 @@ /config.log /config.status /configure +/perl/Build +/perl/MYMETA.json /perl/MYMETA.yml -/perl/Makefile.PL -/perl/Makefile.old +/perl/_build/ /perl/blib/ /perl/pm_to_blib /perl/t/data/test.keytab /perl/t/data/test.principal /perl/t/data/test.realm /perl/t/data/test.krbtype +/perl/t/lib/Test/RRA.pm +/perl/t/lib/Test/RRA/ /tests/client/basic-t /tests/client/full-t /tests/client/prompt-t |