Merge branch 'feature-quotas' into develop
Conflicts: docs/dev-guide.rst
webproject: Do not ljust values in vertical mode
Left-justifying resulted in long wrapped empty lines, when a valueexceeded the line size.
Merge branch 'develop' into feature-quotas
Add support for ordering in ListCommand
Make list command order results either by 'order_by' class attribute,or by primary key.
Merge branch 'feature-change-astakos-commands' into feature-quotas
Conflicts: snf-astakos-app/astakos/im/management/commands/resource-list.py snf-astakos-app/astakos/im/management/commands/service-list.py snf-astakos-app/astakos/im/management/commands/service-modify.py...
Fix import and add main to unittests
Update astakos listing commands
Refs: #3346
Move astakos lib from snf-common to snf-django-lib
Update HIDDEN_COOKIES setting
Use pprint_table in server-show command
View revisions
Also available in: Atom