libmemcached

Merge lp:~mordred/libmemcached/missing-files into lp:~tangent-org/libmemcached/trunk

  1. missing-files
  2. Merge into trunk
Proposed by Monty Taylor
Status: Merged
Approved by: Brian Aker
Approved revision: 896
Merged at revision: 915
Proposed branch: lp:~mordred/libmemcached/missing-files
Merge into: lp:~tangent-org/libmemcached/trunk
Diff against target: 26 lines (+5/-0)
2 files modified
Makefile.am (+1/-0)
tests/include.am (+4/-0)
To merge this branch: bzr merge lp:~mordred/libmemcached/missing-files
Reviewer Review Type Date Requested Status
Brian Aker Pending
Review via email: mp+33038@code.launchpad.net

Description of the change

Added a few files that the tarball missed.

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 'Makefile.am'
2--- Makefile.am 2010-07-27 22:38:51 +0000
3+++ Makefile.am 2010-08-18 17:54:58 +0000
4@@ -19,6 +19,7 @@
5 ${srcdir}/m4/pandora_*.m4 \
6 .quickly \
7 README.FIRST \
8+ README.win32 \
9 config/autorun.sh \
10 config/pandora-plugin \
11 config/uncrustify.cfg \
12
13=== modified file 'tests/include.am'
14--- tests/include.am 2010-07-28 00:27:30 +0000
15+++ tests/include.am 2010-08-18 17:54:58 +0000
16@@ -14,6 +14,10 @@
17 TESTS_LDADDS+= libmemcached/libmemcachedutil.la
18 endif
19
20+EXTRA_DIST+= \
21+ tests/cpp_example.cc \
22+ tests/output_plus.res
23+
24 noinst_HEADERS+= \
25 tests/hash_results.h \
26 tests/ketama_test_cases.h \

Subscribers

People subscribed via source and target branches

to all changes: