Merge lp:~brianaker/gearmand/vcs-check into lp:gearmand

Proposed by Brian Aker on 2013-08-23
Status: Merged
Merged at revision: 867
Proposed branch: lp:~brianaker/gearmand/vcs-check
Merge into: lp:gearmand
Diff against target: 44 lines (+5/-1)
1 file modified
libgearman-server/plugins/protocol/gear/protocol.cc (+5/-1)
To merge this branch: bzr merge lp:~brianaker/gearmand/vcs-check
Reviewer Review Type Date Requested Status
Tangent Trunk 2013-08-23 Pending
Review via email: mp+181726@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libgearman-server/plugins/protocol/gear/protocol.cc'
2--- libgearman-server/plugins/protocol/gear/protocol.cc 2013-08-07 22:23:36 +0000
3+++ libgearman-server/plugins/protocol/gear/protocol.cc 2013-08-23 07:09:25 +0000
4@@ -2,7 +2,7 @@
5 *
6 * Gearmand client and server library.
7 *
8- * Copyright (C) 2012 Data Differential, http://datadifferential.com/
9+ * Copyright (C) 2012-2013 Data Differential, http://datadifferential.com/
10 * All rights reserved.
11 *
12 * Redistribution and use in source and binary forms, with or without
13@@ -229,6 +229,7 @@
14 }
15 }
16
17+#if defined(VCS_CHECKOUT) && VCS_CHECKOUT
18 if (packet->command == GEARMAN_COMMAND_ECHO_REQ and packet->data_size)
19 {
20 gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM,
21@@ -284,6 +285,7 @@
22 "GEAR %s",
23 gearman_strcommand(packet->command));
24 }
25+#endif
26
27 ret_ptr= GEARMAND_SUCCESS;
28 return used_size;
29@@ -294,6 +296,7 @@
30 void *data, const size_t data_size,
31 gearmand_error_t& ret_ptr)
32 {
33+#if defined(VCS_CHECKOUT) && VCS_CHECKOUT
34 if (packet->command == GEARMAN_COMMAND_ECHO_RES and packet->data_size)
35 {
36 gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM,
37@@ -315,6 +318,7 @@
38 "GEAR %s",
39 gearman_strcommand(packet->command));
40 }
41+#endif
42
43 if (packet->args_size == 0)
44 {

Subscribers

People subscribed via source and target branches

to all changes: