Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Small code refactor to help open source push pull

Summary:
will remove version number based merge conflicts

Test Plan:
compile

DiffCamp Revision: 113466
Reviewed By: pkhemani
CC: agiardullo, pkhemani, scribe-dev@lists
Revert Plan:
OK

git-svn-id: svn+ssh://tubbs/svnapps/fbomb/trunk/fbcode/scribe@27525 2248de34-8caa-4a3c-bc55-5e52d9d7b73a
  • Loading branch information...
commit 5c7ddd6ece502f5aa60bcda813fe8ea66fec8618 1 parent 9c48ec2
groys authored groys committed
Showing with 3 additions and 1 deletion.
  1. +2 −0  src/env_default.h
  2. +1 −1  src/scribe_server.h
View
2  src/env_default.h
@@ -20,6 +20,8 @@
#ifndef SCRIBE_ENV
#define SCRIBE_ENV
+// scribe version
+const std::string scribeversion("2.2");
#define DEFAULT_CONF_FILE_LOCATION "/usr/local/scribe/scribe.conf"
/*
View
2  src/scribe_server.h
@@ -43,7 +43,7 @@ class scribeHandler : virtual public scribe::thrift::scribeIf,
scribe::thrift::ResultCode Log(const std::vector<scribe::thrift::LogEntry>& messages);
- void getVersion(std::string& _return) {_return = "2.2";}
+ void getVersion(std::string& _return) {_return = scribeversion;}
facebook::fb303::fb_status getStatus();
void getStatusDetails(std::string& _return);
void setStatus(facebook::fb303::fb_status new_status);
Please sign in to comment.
Something went wrong with that request. Please try again.