tree 083bf33d5fba4d3c887acaf7a1741b2bc24eaa26
parent 469944fe0ce7d51dd7ed85f483f42c63efe2ca39
parent 1e0ccd5473686111a04c2af5d589c6eedb50dda7
author Hongkai Liu <hongkai.liu@ericsson.com> 1478092147 -0400
committer Hongkai Liu <hongkai.liu@ericsson.com> 1478096971 -0400

Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  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: I5f1177f6dbc0fe99ce702963eccd588fb008470a