Permalink
Switch branches/tags
Commits on May 28, 2014
  1. merge develop to master

    vinoski committed May 28, 2014
    Webmachine users are starting to use Erlang/OTP 17.0, which requires
    changes to webmachine and its meck dependency. Merge the develop branch to
    master to ensure all changes necessary for 17.0 are available there.
  2. Merge pull request #204 from basho/vinoski/meck-0.8.2

    vinoski committed May 28, 2014
    pick up meck 0.8.2 to get Erlang 17.0 fixes
  3. Merge pull request #203 from basho/vinoski/vsn-17-check

    vinoski committed May 28, 2014
    fix version check in rebar.config.script for 17.0
Commits on May 13, 2014
  1. Merge pull request #201 from basho/mochiweb-1.5.1p7

    vinoski committed May 13, 2014
    move to basho mochiweb 1.5.1p7
  2. move to basho mochiweb 1.5.1p7

    vinoski committed May 13, 2014
Commits on Apr 27, 2014
  1. Merge pull request #198 from basho/no-drinks

    vinoski committed Apr 27, 2014
    no drinks
  2. no drinks

    vinoski committed Apr 27, 2014
Commits on Feb 14, 2014
  1. Merge pull request #191 from openx/remove_now

    reiddraper committed Feb 14, 2014
    replace use of now() with os:timestamp(), to remove some lock contention
Commits on Jan 30, 2014
  1. Merge pull request #186 from nparry/range_fix_for_cs

    reiddraper committed Jan 30, 2014
    Fix handling of unparsable range headers
Commits on Jan 29, 2014
  1. Fix handling of unparsable range headers

    nparry committed Jan 29, 2014
    Riak CS v1.4.2 returns a 416 status code for parseable but invalid Range
    headers, but a 500 status when the header can't be parsed. This makes
    the behavior consistent (always return the 416 status) by properly
    handling the result of 'fail' from mochiweb_http:parse_range_request
  2. Merge pull request #185 from basho/feature/xref

    Vagabond committed Jan 29, 2014
    Add xref target
  3. Add xref target

    Vagabond committed Jan 29, 2014
Commits on Jan 17, 2014
  1. Merge pull request #182 from basho/feature/tools.mk

    Vagabond committed Jan 17, 2014
    Use tools.mk in Makefile
  2. Use tools.mk in Makefile

    Vagabond committed Jan 17, 2014
Commits on Dec 18, 2013
  1. Merge pull request #177 from NineFX/fix-edoc-init-routes

    seancribbs committed Dec 18, 2013
    Fixes a fatal edoc error. Changes edoc spec to init_routes/1
Commits on Dec 5, 2013
  1. Merge pull request #179 from NineFX/use-newer-otp-in-travis

    seancribbs committed Dec 5, 2013
    Update .travis.yml to use the most recent releases of Erlang OTP
Commits on Dec 4, 2013
Commits on Nov 23, 2013
  1. Merge pull request #176 from agx/fixes/error_logger

    seancribbs committed Nov 23, 2013
    Make sure Reason is a string
Commits on Nov 21, 2013
  1. Make sure Reason is a string

    agx committed Nov 21, 2013
    Since 8194983 when an exception
    in the app occured the console had:
    
    Bad value on output port 'efile'
    
    and the error log remained empty. This was due to the tupe not being
    converted to string.
Commits on Nov 4, 2013
  1. Merge pull request #173 from basho/encode-error-body-rebased

    Kelly McLaughlin committed Nov 4, 2013
    Encode the error response before sending it.
  2. Encode the error response before sending it.

    ewanmellor committed with Kelly McLaughlin Jan 21, 2013
    Pass the response from ErrorHandler:render_error through encode_body before
    sending it.  This means that if the client has sent an appropriate
    Accept-Encoding or Accept-Charset header then they will get the error
    response encoded correctly.
    
    As part of this, we have to handle the situation where a charset or encoding
    hasn't yet been chose (or doesn't match one of the available options) even
    though the resource specifies some.  This happens if the error response is
    triggered before the encoding/charset header processing.
Commits on Oct 16, 2013
  1. Roll webmachine version 1.10.5

    Jared Morrow committed Oct 16, 2013
Commits on Sep 12, 2013
Commits on Sep 9, 2013
  1. Merge pull request #166 from basho/vinoski/r16-test-fixes

    vinoski committed Sep 9, 2013
    fix unit tests for Erlang/OTP R16
Commits on Sep 8, 2013
  1. fix unit tests for Erlang/OTP R16

    vinoski committed Sep 8, 2013
    Fix two problems with the unit tests for R16:
    
    1. Code failed to compile due to warnings caused by calls to the deprecated
    crypto:md5/1 with compiler option warnings_as_errors in effect. Use the
    existing {d,old_hash} erlc define to call crypto:hash/2 instead on Erlang
    versions newer than R15B01.
    
    2. Tests involving POSTs and status code 303 redirects failed due to a
    missing {autodirect,false} option on httpc:request/4 calls. In older
    versions of Erlang httpc didn't redirect for such calls, but that changed
    in commit 4b9b5cc6 in the Erlang/OTP github repository, which fixed
    OTP-10765 as part of the R16B release. Also verify that the presence of the
    {autoredirect,false} option doesn't break the tests for older R15 or R14
    releases.
Commits on Aug 30, 2013
  1. Change meck dep to match that on develop

    Jared Morrow committed Aug 30, 2013
Commits on Aug 29, 2013
  1. Change meck repo to basho fork

    Jared Morrow committed Aug 29, 2013
Commits on Aug 24, 2013
  1. Update meck dependency tag

    jtuple committed Aug 24, 2013
Commits on Aug 23, 2013
  1. Change app vsn setting to git rather than fixed version

    Jared Morrow committed Aug 23, 2013
Commits on Aug 16, 2013
  1. Merge branch 'ms-integration-testing'

    Kelly McLaughlin committed Aug 16, 2013