Merge branch '2.1' into develop

This commit is contained in:
Markus Mäkelä
2017-02-08 09:32:18 +02:00
16 changed files with 120 additions and 179 deletions

View File

@ -134,12 +134,6 @@ struct subcommand showoptions[] =
{0, 0, 0}
},
#endif
{
"dcblist", 0, 0, dprintDCBList,
"Show DCB statistics",
"Show statistics for the list of all DCBs(descriptor control blocks)",
{0}
},
{
"dcbs", 0, 0, dprintAllDCBs,
"Show all DCBs",
@ -166,12 +160,6 @@ struct subcommand showoptions[] =
"Show the epoll polling system statistics",
{0, 0, 0}
},
{
"eventq", 0, 0, dShowEventQ,
"Show event queue",
"Show the queue of events waiting to be processed",
{0, 0, 0}
},
{
"eventstats", 0, 0, dShowEventStats,
"Show event queue statistics",
@ -262,12 +250,6 @@ struct subcommand showoptions[] =
"Show a single session in MaxScale, e.g. show session 5",
{ARG_TYPE_SESSION, 0, 0}
},
{
"sessionlist", 0, 0, dprintSessionList,
"Show session list statistics",
"Show statistics for the list of all sessions",
{0, 0, 0}
},
{
"sessions", 0, 0, dprintAllSessions,
"Show all sessions",