Permalink
Commits on Feb 4, 2012
  1. Couchstore changes

    apage43 committed Feb 4, 2012
    Change-Id: Ib55b0a948a8f1bbbf3f50d3c823320fa69f7e5e8
Commits on Feb 3, 2012
  1. MB-4749 - dont make dist memcachetest/libcouchbase/cb-examples

    steveyen committed Feb 2, 2012
    Don't dist memcachetest or libcouchbase, and also cleanup tmp
    directory if a component doesn't have a 'make dist' (like
    couchbase-examples).
    
    Change-Id: I862bb022d3871a2a9643f4581094513420a60f92
    Reviewed-on: http://review.couchbase.org/12954
    Tested-by: Farshid Ghods <farshid.ghods@gmail.com>
    Reviewed-by: Farshid Ghods <farshid.ghods@gmail.com>
Commits on Jan 21, 2012
  1. Merge remote branch 'origin/branch-18' into branch-20

    steveyen committed Jan 21, 2012
    * origin/branch-18:
      No dist of the workload-generator
      configure vbucket migrator without sasl
    
    Conflicts:
    	Makefile.top
    
    Change-Id: I54c1b9d9e76fe182888066ea9f046fa0b9c7bdbd
  2. No dist of the workload-generator

    steveyen committed Jan 20, 2012
    It depends on a python couchbase client library, so cut
    the chain of dependencies here.
    
    Change-Id: Ie4ccabe6f68780dc47137f4691c7572465c891ae
    Reviewed-on: http://review.couchbase.org/12540
    Tested-by: Farshid Ghods <farshid.ghods@gmail.com>
    Reviewed-by: Farshid Ghods <farshid.ghods@gmail.com>
Commits on Jan 17, 2012
  1. Make it easier to run valgrind/umem/watchmalloc on memcached

    trondn committed with alk Jan 17, 2012
    Change-Id: Iabb747987df6b02059036cd0fba4406ad44a032b
    Reviewed-on: http://review.couchbase.org/12431
    Tested-by: Trond Norbye <trond.norbye@gmail.com>
    Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Commits on Jan 15, 2012
  1. added targets for running end to end tests

    farshidce committed with trondn Jan 15, 2012
    make e2etest
    make e2eviewtests
    
    Change-Id: I8da4ed14cb25063023d970397a89b7ab4304ae18
    Reviewed-on: http://review.couchbase.org/12373
    Reviewed-by: Steve Yen <steve.yen@gmail.com>
    Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
    Tested-by: Trond Norbye <trond.norbye@gmail.com>
Commits on Jan 11, 2012
  1. don't depend on tlm/Makefile.top. Fixes src tarballs. MB-4621

    Aliaksey Kandratsenka committed with steveyen Jan 11, 2012
    We want Makefile auto-refresh only if tlm exists, which is not the
    case of .tgz source releases.
    
    Change-Id: Id343ce09be6deb0b2b6c38d601852a7ba521d9c5
    Reviewed-on: http://review.couchbase.org/12261
    Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
    Reviewed-by: Steve Yen <steve.yen@gmail.com>
Commits on Dec 29, 2011
  1. Typo

    steveyen committed Dec 29, 2011
    Change-Id: Iaed5f8519daa8a8eb310145c136fce580cd848ce
    Reviewed-on: http://review.couchbase.org/11959
    Reviewed-by: Steve Yen <steve.yen@gmail.com>
    Tested-by: Steve Yen <steve.yen@gmail.com>
Commits on Dec 22, 2011
  1. Don't build libcouchbase by default

    trondn committed with alk Dec 21, 2011
    Change-Id: Ib6eb080a3287931e98e11bf735c02d36df1176fa
    Reviewed-on: http://review.couchbase.org/11787
    Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
    Reviewed-by: Matt Ingenthron <matt@couchbase.com>
    Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Commits on Dec 21, 2011
  1. Dont quit distclean of moxi / memcached logs arent found

    daleharvey committed with steveyen Dec 21, 2011
    Change-Id: Icc09fe089e755a00edafb0a72d77321695cabb20
    Reviewed-on: http://review.couchbase.org/11800
    Tested-by: Steve Yen <steve.yen@gmail.com>
    Reviewed-by: Steve Yen <steve.yen@gmail.com>
  2. configure vbucket migrator without sasl

    farshidce committed with steveyen Dec 21, 2011
    Change-Id: Iedb66e39b2a4fa547035b64a023c3d670f7a611b
    Reviewed-on: http://review.couchbase.org/11816
    Reviewed-by: Steve Yen <steve.yen@gmail.com>
    Reviewed-by: Farshid Ghods <farshid.ghods@gmail.com>
    Tested-by: Steve Yen <steve.yen@gmail.com>
  3. Fix dependency for libcouchbase

    trondn committed Dec 21, 2011
    Change-Id: I641e37e36e93c6f1646c04d06b3fbfb0714d24ec
    Reviewed-on: http://review.couchbase.org/11786
    Tested-by: Trond Norbye <trond.norbye@gmail.com>
    Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Commits on Dec 20, 2011
  1. Add default LDFLAGS/CPPFLAGS for libcouchbase

    trondn committed Dec 19, 2011
    Change-Id: I0763f0b5cb801938e5f421ce383a2c28811ef48b
    Reviewed-on: http://review.couchbase.org/11732
    Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
    Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
  2. Build libmemcached without memcached

    trondn committed Dec 19, 2011
    Change-Id: I593613be98af2cb39739dbf8e7c7f4944df72e04
    Reviewed-on: http://review.couchbase.org/11731
    Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
    Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
  3. libvbucket doesn't need libmemcached anymore

    trondn committed Dec 19, 2011
    Change-Id: I4b1ffd4ec6a9a4d3c5cc27d83f5872f56c918ab9
    Reviewed-on: http://review.couchbase.org/11730
    Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
    Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
  4. Reuse steps to set up couchbase-python-client

    bcui6611 committed Dec 19, 2011
    Both couchbase-examples and workload-generator depend on python
    library couchbase-python-client
    
    Change-Id: I769ae434ccd3dc38cdf2e792358abec557978e88
    Reviewed-on: http://review.couchbase.org/11744
    Reviewed-by: Steve Yen <steve.yen@gmail.com>
    Tested-by: Bin Cui <bin.cui@gmail.com>
Commits on Dec 19, 2011
  1. Merge branch 'branch-18' into branch-20

    bcui6611 committed Dec 19, 2011
    * branch-18:
      Need to install couchbase-python-client
      Add workload-generator
      Rename couchbase to couchbase-cli
    
    Conflicts:
    	Makefile.top
    
    Change-Id: If74de4a0ec949dcc0cce8202f78bca1b5a9e2bf6
Commits on Dec 17, 2011
  1. Need to install couchbase-python-client

    bcui6611 committed Dec 17, 2011
    Need to include couchbase-pythyon-client as part of package
    for windows distribution
    
    Change-Id: Ib7b73ff14e1c239d7d25a204a5790f7f88c23f5a
    Reviewed-on: http://review.couchbase.org/11714
    Reviewed-by: Steve Yen <steve.yen@gmail.com>
    Tested-by: Bin Cui <bin.cui@gmail.com>
Commits on Dec 14, 2011
  1. Add workload-generator

    bcui6611 committed Dec 14, 2011
    Change-Id: I14cc5f4a3571914d7a8a8637042ef8f1b344add1
    Reviewed-on: http://review.couchbase.org/11597
    Reviewed-by: Steve Yen <steve.yen@gmail.com>
    Tested-by: Bin Cui <bin.cui@gmail.com>
Commits on Dec 7, 2011
  1. Rename couchbase to couchbase-cli

    bcui6611 committed Dec 7, 2011
    Change-Id: Id9eba66fc468370dfa71b8b75ceb6e51616c5620
    Reviewed-on: http://review.couchbase.org/11524
    Reviewed-by: Bin Cui <bin.cui@gmail.com>
    Tested-by: Bin Cui <bin.cui@gmail.com>
  2. Rename couchbase to couchbase-cli

    bcui6611 committed Dec 7, 2011
    Change-Id: Id9eba66fc468370dfa71b8b75ceb6e51616c5620
    Reviewed-on: http://review.couchbase.org/11519
    Tested-by: Farshid Ghods <farshid.ghods@gmail.com>
    Reviewed-by: Farshid Ghods <farshid.ghods@gmail.com>
    Tested-by: Bin Cui <bin.cui@gmail.com>
  3. Fix a merge issue

    bcui6611 committed with steveyen Dec 7, 2011
    Need to call Makefile.genconf to generate configuration file
    
    Change-Id: I99507ba5fa6b84713e261286a4cf62a078e28ebe
    Reviewed-on: http://review.couchbase.org/11500
    Reviewed-by: Steve Yen <steve.yen@gmail.com>
    Tested-by: Steve Yen <steve.yen@gmail.com>
Commits on Dec 6, 2011
  1. Merge remote-tracking branch 'membase/branch-18' into tlm-work

    Aliaksey Kandratsenka committed Dec 6, 2011
    Change-Id: I4735b3c89e5423eff38c8841540e9a123f6fd648
Commits on Dec 4, 2011
  1. Update for GeoCouch config location change.

    vmx committed with alk Aug 20, 2011
    The GeoCouch configuration file was moved from local.d
    to default.d.
    
    Change-Id: If61024e5ac1ede79e376c5cfbb4a7f34f6aa4801
    Reviewed-on: http://review.couchbase.org/9138
    Reviewed-by: Jan Lehnardt <jan@couchbase.com>
    Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Commits on Nov 28, 2011
  1. Don't need genconf step for 1.8 build

    bcui6611 committed Nov 28, 2011
    Change-Id: I55401b0d1d6297241d2a9ee34584ba4a5e24c6c0
    Reviewed-on: http://review.couchbase.org/11208
    Reviewed-by: Steve Yen <steve.yen@gmail.com>
    Tested-by: Bin Cui <bin.cui@gmail.com>
  2. Correctly name install targets for geocouch and mccouch.

    aartamonau committed with alk Nov 28, 2011
    Change-Id: Ide705deadda024fd5bcda4b2c8f5f2fca5b63830
    Reviewed-on: http://review.couchbase.org/11187
    Tested-by: Aliaksey Artamonau <aliaksiej.artamonau@gmail.com>
    Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
    Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
  3. automagically update top-level Makefile

    Aliaksey Kandratsenka committed with trondn Nov 28, 2011
    Because we depend on GNU Make we can use it's nice features. One of
    them is automatic update of Makefile if there are rules for that. So
    we just define rule for it.
    
    This fixes one of annoyances of repo which copies tlm/Makefile.top
    into top-level Makefile, so updates of tlm/Makefile.top do not apply
    to top-level Makefile.
    
    Change-Id: I105fdfb95fcb11fd5f96b1a2a6483d37f0808223
    Reviewed-on: http://review.couchbase.org/11184
    Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
    Tested-by: Trond Norbye <trond.norbye@gmail.com>
  4. order ns_server and _geo_couch install instead of mccouch

    Aliaksey Kandratsenka committed with trondn Nov 28, 2011
    Because that was originally intended.
    
    Change-Id: Ifbcc156dbba1b262535f800f9b114e5f118bee56
    Reviewed-on: http://review.couchbase.org/11183
    Tested-by: Trond Norbye <trond.norbye@gmail.com>
    Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
  5. simplify top-level makefile by always building couchdb

    Aliaksey Kandratsenka committed with trondn Nov 28, 2011
    Change-Id: Iebae2a5529099fd01832cfd610bcaecc0bfd6ed0
    Reviewed-on: http://review.couchbase.org/11182
    Tested-by: Trond Norbye <trond.norbye@gmail.com>
    Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Commits on Nov 23, 2011
  1. Rebrand from membase to couchbase

    bcui6611 committed with steveyen Nov 23, 2011
    Change-Id: Ib3ef9e83f0f538aaa425d3cfb9d201b959118bde
    Reviewed-on: http://review.couchbase.org/11125
    Tested-by: Steve Yen <steve.yen@gmail.com>
    Reviewed-by: Steve Yen <steve.yen@gmail.com>
Commits on Nov 18, 2011
  1. correctly order mccouch and ns_server install targets

    Aliaksey Kandratsenka committed with trondn Nov 18, 2011
    Previous fix: http://review.couchbase.org/11003 incorrectly added
    make-install-ns_server as first (and thus default) target and was
    reverted.
    
    Change-Id: Id38eabffb20eda30c9423f6907154eb12db279f9
    Reviewed-on: http://review.couchbase.org/11011
    Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
    Tested-by: Trond Norbye <trond.norbye@gmail.com>
    Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
  2. Revert "order mccouch and ns_server installs correctly"

    trondn committed with alk Nov 18, 2011
    This reverts commit af7cf16.
    
    Build no longer works from a clean checkout
    
    Change-Id: I1d7ddecfe9134c740913c135e9d3a75ec20bedad
    Reviewed-on: http://review.couchbase.org/11005
    Tested-by: Trond Norbye <trond.norbye@gmail.com>
    Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
  3. order mccouch and ns_server installs correctly

    Aliaksey Kandratsenka committed with steveyen Nov 18, 2011
    See http://review.couchbase.org/10271
    
    Correct fix is to add dependency between dependent (sub)goals.
    
    Change-Id: Id730abfbae065f36a5f8f90f45d9fa0c941166ae
    Reviewed-on: http://review.couchbase.org/11003
    Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
    Reviewed-by: Steve Yen <steve.yen@gmail.com>
  4. Integrate docloader to server build

    bcui6611 committed with alk Oct 5, 2011
    Change-Id: I51aefc81088be92753786201c56604d11b235653
    Reviewed-on: http://review.couchbase.org/9959
    Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
    Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Commits on Nov 14, 2011
  1. Build ns_server as last item.

    vmx committed with steveyen Oct 21, 2011
    Currently all code is built before ns_server, except GeoCouch and
    mccouch. This is a problem with CAPI. ns_server needs a different
    config file for GeoCouch, hence the ns_server configuration should
    overwrite the one supplied by GeoCouch. Therefore ns_server should
    be built after GeoCouch.
    
    Change-Id: I2402a4d4c12cb65458f258e84bd56bb998bfd2c0
    Reviewed-on: http://review.couchbase.org/10271
    Reviewed-by: Steve Yen <steve.yen@gmail.com>
    Tested-by: Steve Yen <steve.yen@gmail.com>