diff options
| author |   imarom <imarom@cisco.com> | 2015-12-15 11:40:35 -0500 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2015-12-15 11:40:35 -0500 |
| commit | 68bf754b96a84c8a2a32bffab30189f8c8e9ad1b (patch) | |
| tree | 03ed30251c1cc611d888bf62d5c4a8d36566dfd7 /src/rpc-server/commands/trex_rpc_cmds.h | |
| parent | 419a25e989c47dcc5e94b9e3bc64252fb5197f10 (diff) | |
| parent | 7b1796d823b38f7c8c801e19c51a4044bc39b17c (diff) | |
Merging lastest 'master' to side branch 'vm'
Conflicts:
scripts/automation/trex_control_plane/console/trex_console.py
Diffstat (limited to 'src/rpc-server/commands/trex_rpc_cmds.h')
| -rw-r--r-- | src/rpc-server/commands/trex_rpc_cmds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpc-server/commands/trex_rpc_cmds.h b/src/rpc-server/commands/trex_rpc_cmds.h index c22ef390..b9be1fbe 100644 --- a/src/rpc-server/commands/trex_rpc_cmds.h +++ b/src/rpc-server/commands/trex_rpc_cmds.h @@ -70,7 +70,7 @@ void get_hostname(std::string &hostname); * ownership */ TREX_RPC_CMD_DEFINE(TrexRpcCmdGetOwner, "get_owner", 1, false); -TREX_RPC_CMD_DEFINE(TrexRpcCmdAcquire, "acquire", 3, false); +TREX_RPC_CMD_DEFINE(TrexRpcCmdAcquire, "acquire", 4, false); TREX_RPC_CMD_DEFINE(TrexRpcCmdRelease, "release", 1, true); |