Merge lp:~vjsamuel/gearmand/fix-bug-868883 into lp:gearmand/1.0

Proposed by Vijay Samuel
Status: Merged
Merge reported by: Brian Aker
Merged at revision: not available
Proposed branch: lp:~vjsamuel/gearmand/fix-bug-868883
Merge into: lp:gearmand/1.0
Diff against target: 15 lines (+4/-1)
1 file modified
tests/include.am (+4/-1)
To merge this branch: bzr merge lp:~vjsamuel/gearmand/fix-bug-868883
Reviewer Review Type Date Requested Status
Brian Aker Pending
Review via email: mp+78350@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
=== modified file 'tests/include.am'
--- tests/include.am 2011-08-16 22:53:06 +0000
+++ tests/include.am 2011-10-06 05:07:24 +0000
@@ -28,7 +28,10 @@
28noinst_LTLIBRARIES+= tests/libstartworker.la28noinst_LTLIBRARIES+= tests/libstartworker.la
29tests_libstartworker_la_CXXFLAGS=29tests_libstartworker_la_CXXFLAGS=
30tests_libstartworker_la_CXXFLAGS+= $(PTHREAD_CFLAGS)30tests_libstartworker_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
31tests_libstartworker_la_LIBADD= $(PTHREAD_LIBS)31tests_libstartworker_la_LIBADD= \
32 $(PTHREAD_LIBS) \
33 $(LTLIBUUID)
34
32tests_libstartworker_la_SOURCES= tests/start_worker.cc35tests_libstartworker_la_SOURCES= tests/start_worker.cc
33tests_libstartworker_la_SOURCES+= util/instance.cc36tests_libstartworker_la_SOURCES+= util/instance.cc
34tests_libstartworker_la_SOURCES+= util/operation.cc37tests_libstartworker_la_SOURCES+= util/operation.cc

Subscribers

People subscribed via source and target branches