Merge bug24606

This commit is contained in:
Simon MacMullen 2012-02-03 13:04:55 +00:00
commit e132047db2
2 changed files with 23 additions and 52 deletions

View File

@ -1,34 +1,20 @@
%% The contents of this file are subject to the Mozilla Public License %% The contents of this file are subject to the Mozilla Public License
%% Version 1.1 (the "License"); you may not use this file except in %% Version 1.1 (the "License"); you may not use this file except in
%% compliance with the License. You may obtain a copy of the License at %% compliance with the License. You may obtain a copy of the License
%% http://www.mozilla.org/MPL/ %% at http://www.mozilla.org/MPL/
%% %%
%% Software distributed under the License is distributed on an "AS IS" %% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
%% License for the specific language governing rights and limitations %% the License for the specific language governing rights and
%% under the License. %% limitations under the License.
%% %%
%% The Original Code is RabbitMQ. %% The Original Code is RabbitMQ.
%% %%
%% The Initial Developers of the Original Code are LShift Ltd, %% The Initial Developer of the Original Code is VMware, Inc.
%% Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. %% Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
%%
%% Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
%% Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
%% are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
%% Technologies LLC, and Rabbit Technologies Ltd.
%%
%% Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
%% Ltd. Portions created by Cohesive Financial Technologies LLC are
%% Copyright (C) 2007-2010 Cohesive Financial Technologies
%% LLC. Portions created by Rabbit Technologies Ltd are Copyright
%% (C) 2007-2010 Rabbit Technologies Ltd.
%%
%% All Rights Reserved.
%%
%% Contributor(s): ______________________________________.
%% %%
-module(rabbit_auth_mechanism_ssl). -module(rabbit_auth_mechanism_ssl).
-behaviour(rabbit_auth_mechanism). -behaviour(rabbit_auth_mechanism).

View File

@ -1,32 +1,17 @@
%% The contents of this file are subject to the Mozilla Public License %% The contents of this file are subject to the Mozilla Public License
%% Version 1.1 (the "License"); you may not use this file except in %% Version 1.1 (the "License"); you may not use this file except in
%% compliance with the License. You may obtain a copy of the License at %% compliance with the License. You may obtain a copy of the License
%% http://www.mozilla.org/MPL/ %% at http://www.mozilla.org/MPL/
%% %%
%% Software distributed under the License is distributed on an "AS IS" %% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
%% License for the specific language governing rights and limitations %% the License for the specific language governing rights and
%% under the License. %% limitations under the License.
%% %%
%% The Original Code is RabbitMQ. %% The Original Code is RabbitMQ.
%% %%
%% The Initial Developers of the Original Code are LShift Ltd, %% The Initial Developer of the Original Code is VMware, Inc.
%% Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. %% Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
%%
%% Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
%% Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
%% are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
%% Technologies LLC, and Rabbit Technologies Ltd.
%%
%% Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
%% Ltd. Portions created by Cohesive Financial Technologies LLC are
%% Copyright (C) 2007-2010 Cohesive Financial Technologies
%% LLC. Portions created by Rabbit Technologies Ltd are Copyright
%% (C) 2007-2010 Rabbit Technologies Ltd.
%%
%% All Rights Reserved.
%%
%% Contributor(s): ______________________________________.
%% %%
-module(rabbit_auth_mechanism_ssl_app). -module(rabbit_auth_mechanism_ssl_app).