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

1 files changed, 0 insertions, 53 deletions

diff --git a/perl/Wallet/Schema/Result/KeytabSync.pm b/perl/Wallet/Schema/Result/KeytabSync.pm
deleted file mode 100644
index ca84277..0000000
--- a/perl/Wallet/Schema/Result/KeytabSync.pm
+++ /dev/null
@@ -1,53 +0,0 @@
-# Wallet schema for keytab synchronization.
-#
-# Written by Jon Robertson <jonrober@stanford.edu>
-# Copyright 2012, 2013
-#     The Board of Trustees of the Leland Stanford Junior University
-#
-# See LICENSE for licensing terms.
-
-package Wallet::Schema::Result::KeytabSync;
-
-use strict;
-use warnings;
-
-use base 'DBIx::Class::Core';
-
-=for stopwords
-keytab
-
-=head1 NAME
-
-Wallet::Schema::Result::KeytabSync - Wallet schema for keytab synchronization
-
-=head1 DESCRIPTION
-
-=cut
-
-__PACKAGE__->table("keytab_sync");
-
-=head1 ACCESSORS
-
-=head2 ks_name
-
-  data_type: 'varchar'
-  is_nullable: 0
-  size: 255
-
-=head2 ks_target
-
-  data_type: 'varchar'
-  is_nullable: 0
-  size: 255
-
-=cut
-
-__PACKAGE__->add_columns(
-  "ks_name",
-  { data_type => "varchar", is_nullable => 0, size => 255 },
-  "ks_target",
-  { data_type => "varchar", is_nullable => 0, size => 255 },
-);
-__PACKAGE__->set_primary_key("ks_name", "ks_target");
-
-1;