tree 305edf00a58ddcd08c6ce369c68b4483b7dfdf4e
parent 37ed1c8fdccf3b638c082d466f0b37b6fcc53cb1
parent 47f1b79c7609edb296b68ef441c1e4fe4e789c18
author Hongkai Liu <hongkai.liu@ericsson.com> 1478106936 -0400
committer Hongkai Liu <hongkai.liu@ericsson.com> 1478106991 -0400

Merge branch 'stable-2.13'

* stable-2.13:
  Show more fields in ls-users command
  Add options to filter by active flag in ls-users command
  Escape double dashes in documentation

Change-Id: Ibf4d331e983eef1e63bac4e40e2fb7a01738de21