Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Qihoo360/pika
Browse files Browse the repository at this point in the history
  • Loading branch information
KernelMaker committed May 19, 2016
2 parents b48fcad + 3e58072 commit 09f6e87
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/pika_admin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@ void InfoCmd::InfoServer(std::string &info) {
uint32_t purge_max;
tmp_stream << "# Server\r\n";
tmp_stream << "pika_version:" << kPikaVersion << "\r\n";
tmp_stream << "redis_version:2.8.21" << "\r\n";
tmp_stream << "os:" << host_info.sysname << " " << host_info.release << " " << host_info.machine << "\r\n";
tmp_stream << "arch_bits:" << (reinterpret_cast<char*>(&host_info.machine) + strlen(host_info.machine) - 2) << "\r\n";
tmp_stream << "process_id:" << getpid() << "\r\n";
Expand Down

0 comments on commit 09f6e87

Please sign in to comment.