Merge trunk

[m6w6/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 27188105add92a99d80639159408d9a887f878bf..8432fe194ba45d4a528bb6aad1961ede81733500 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -41,6 +41,7 @@ clients/memdump
 clients/memerror
 clients/memflush
 clients/memparse
+clients/memping
 clients/memrm
 clients/memslap
 clients/memstat
@@ -69,7 +70,6 @@ docs/doctest/
 docs/doctrees/
 docs/html/
 docs/linkcheck/
-docs/man/*
 docs/text
 example/memcached_light
 libhashkit/configure.h
@@ -80,7 +80,9 @@ libmemcached/generated_probes.h
 libmemcached/memcached_configure.h
 libtest/.hg/
 libtest/.hgignore
+libtest/skiptest
 libtest/unittest
+libtest/version.h
 libtest/wait
 libtool
 libtool.m4
@@ -104,8 +106,10 @@ support/libmemcached.pc
 support/libmemcached.spec
 tags
 tests/atomsmasher
+tests/c_sasl_test
 tests/c_test
 tests/cycle
+tests/failure
 tests/hash_plus
 tests/hashplus
 tests/internals
@@ -113,10 +117,21 @@ tests/memcapable
 tests/memplus
 tests/memslap
 tests/output.cmp
+tests/sasl
 tests/startservers
 tests/testapp
 tests/testhashkit
 tests/testplus
 tests/testudp
 tests/var/
+tmp_chroot
 unittests/unittests
+tests/memerror
+tests/memcp
+tests/memdump
+tests/memflush
+tests/memrm
+tests/memstat
+tests/memcat
+clients/memexist
+tests/memexist