Repository: hbase
Updated Branches:
  refs/heads/branch-1 38471229f -> 91a17baae


HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace 
syntax) (Csaba Skrabak)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/91a17baa
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/91a17baa
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/91a17baa

Branch: refs/heads/branch-1
Commit: 91a17baaed4bd6ba6e1a21120aa1cfcb64c17037
Parents: 3847122
Author: Peter Somogyi <psomo...@apache.org>
Authored: Tue Mar 13 10:55:00 2018 +0100
Committer: Peter Somogyi <psomo...@apache.org>
Committed: Tue Mar 13 11:06:41 2018 +0100

----------------------------------------------------------------------
 hbase-shell/src/main/ruby/shell/commands/grant.rb  | 7 ++++---
 hbase-shell/src/main/ruby/shell/commands/revoke.rb | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/91a17baa/hbase-shell/src/main/ruby/shell/commands/grant.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell/commands/grant.rb 
b/hbase-shell/src/main/ruby/shell/commands/grant.rb
index 7880026..4a22004 100644
--- a/hbase-shell/src/main/ruby/shell/commands/grant.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/grant.rb
@@ -22,13 +22,14 @@ module Shell
       def help
         return <<-EOF
 Grant users specific rights.
-Syntax : grant <user>, <permissions> [, <@namespace> [, <table> [, <column 
family> [, <column qualifier>]]]
+Syntax: grant <user or @group>, <permissions> [, <table> [, <column family> [, 
<column qualifier>]]]
+Syntax: grant <user or @group>, <permissions>, <@namespace>
 
 permissions is either zero or more letters from the set "RWXCA".
 READ('R'), WRITE('W'), EXEC('X'), CREATE('C'), ADMIN('A')
 
-Note: Groups and users are granted access in the same way, but groups are 
prefixed with an '@' 
-      character. In the same way, tables and namespaces are specified, but 
namespaces are 
+Note: Groups and users are granted access in the same way, but groups are 
prefixed with an '@'
+      character. Tables and namespaces are specified the same way, but 
namespaces are
       prefixed with an '@' character.
 
 For example:

http://git-wip-us.apache.org/repos/asf/hbase/blob/91a17baa/hbase-shell/src/main/ruby/shell/commands/revoke.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell/commands/revoke.rb 
b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
index 4a0d5ff..fbb99eb 100644
--- a/hbase-shell/src/main/ruby/shell/commands/revoke.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
@@ -22,10 +22,11 @@ module Shell
       def help
         return <<-EOF
 Revoke a user's access rights.
-Syntax : revoke <user> [, <@namespace> [, <table> [, <column family> [, 
<column qualifier>]]]]
+Syntax: revoke <user or @group> [, <table> [, <column family> [, <column 
qualifier>]]]
+Syntax: revoke <user or @group>, <@namespace>
 
-Note: Groups and users access are revoked in the same way, but groups are 
prefixed with an '@' 
-      character. In the same way, tables and namespaces are specified, but 
namespaces are 
+Note: Groups and users access are revoked in the same way, but groups are 
prefixed with an '@'
+      character. Tables and namespaces are specified the same way, but 
namespaces are
       prefixed with an '@' character.
 
 For example:

Reply via email to