[pve-devel] applied: [PATCH access-control 1/2] fix typo in change_passsword

[Thomas Lamprecht]

On 6/12/18 12:33 PM, Dominik Csapak wrote:
> s/passsword/password/
> 
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>  PVE/API2/AccessControl.pm | 2 +-
>  PVE/CLI/pveum.pm          | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/PVE/API2/AccessControl.pm b/PVE/API2/AccessControl.pm
> index e48f0cb..afcd2fa 100644
> --- a/PVE/API2/AccessControl.pm
> +++ b/PVE/API2/AccessControl.pm
> @@ -283,7 +283,7 @@ __PACKAGE__->register_method ({
>      }});
>  
>  __PACKAGE__->register_method ({
> -    name => 'change_passsword', 
> +    name => 'change_password',
>      path => 'password', 
>      method => 'PUT',
>      permissions => { 
> diff --git a/PVE/CLI/pveum.pm b/PVE/CLI/pveum.pm
> index aef7089..dbc3034 100755
> --- a/PVE/CLI/pveum.pm
> +++ b/PVE/CLI/pveum.pm
> @@ -44,7 +44,7 @@ our $cmddef = {
>  		    print "$res->{ticket}\n";
>  		}],
>  
> -    passwd => [ 'PVE::API2::AccessControl', 'change_passsword', ['userid'] ],
> +    passwd => [ 'PVE::API2::AccessControl', 'change_password', ['userid'] ],
>  
>      useradd => [ 'PVE::API2::User', 'create_user', ['userid'] ],
>      usermod => [ 'PVE::API2::User', 'update_user', ['userid'] ],
> 

applied with resolved merge conflict from context
changed by the subcommand commit