Gearman

Merge lp:~eday/gearmand/fixes into lp:gearmand/1.0

  1. fixes
  2. Merge into 1.0
Proposed by Eric Day
Status: Merged
Merged at revision: not available
Proposed branch: lp:~eday/gearmand/fixes
Merge into: lp:gearmand/1.0
Diff against target: 45 lines (+4/-4)
4 files modified
configure.ac (+1/-1)
gearmand/gearmand.c (+1/-1)
libgearman/libgearman.ver (+1/-1)
tests/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~eday/gearmand/fixes
Reviewer Review Type Date Requested Status
Gearman-developers Pending
Review via email: mp+15529@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 'configure.ac'
2--- configure.ac 2009-11-06 00:38:02 +0000
3+++ configure.ac 2009-12-02 05:25:18 +0000
4@@ -14,7 +14,7 @@
5
6 PANDORA_CANONICAL_TARGET(require-cxx)
7
8-GEARMAN_LIBRARY_VERSION=2:1:0
9+GEARMAN_LIBRARY_VERSION=3:0:0
10 # | | |
11 # +------+ | +---+
12 # | | |
13
14=== modified file 'gearmand/gearmand.c'
15--- gearmand/gearmand.c 2009-10-29 22:01:39 +0000
16+++ gearmand/gearmand.c 2009-12-02 05:25:18 +0000
17@@ -160,7 +160,7 @@
18 MCO("version", 'V', NULL, "Display the version of gearmand and exit.")
19 MCO("worker-wakeup", 'w', "WORKERS",
20 "Number of workers to wakeup for each job received. The default is to "
21- "wakeup all avaiable workers.")
22+ "wakeup all available workers.")
23
24 /* Make sure none of the gearman_conf_module_add_option calls failed. */
25 if (gearman_conf_return(&conf) != GEARMAN_SUCCESS)
26
27=== modified file 'libgearman/libgearman.ver'
28--- libgearman/libgearman.ver 2009-09-29 03:57:09 +0000
29+++ libgearman/libgearman.ver 2009-12-02 05:25:18 +0000
30@@ -1,1 +1,1 @@
31-libgearman_2 { global: *; };
32+libgearman_3 { global: *; };
33
34=== modified file 'tests/Makefile.am'
35--- tests/Makefile.am 2009-10-11 07:24:42 +0000
36+++ tests/Makefile.am 2009-12-02 05:25:18 +0000
37@@ -27,7 +27,7 @@
38 SQLITE_RECORD= ./sqlite_test > sqlite_test.rec
39 SQLITE_RUN= ./sqlite_test > sqlite_test.res
40 SQLITE_CHECK= diff ${top_srcdir}/tests/sqlite_test.rec sqlite_test.res
41-SQLITE_RM= rm gearman.sql
42+SQLITE_RM= rm -f gearman.sql gearman.sql-journal
43 SQLITE_VALGRIND= libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes sqlite_test
44 sqlite_test_SOURCES= test.c test_gearmand.c sqlite_test.c
45 endif

Subscribers

People subscribed via source and target branches

to all changes: