Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: jem-osx-arch-f…
Commits on Nov 17, 2012
  1. @jaredmorrow

    Base architecture off of erlc binary class in OSX

    jaredmorrow authored
    Like Solaris, OSX can have both i386 and x86_64 run natively
    no matter how the kernel is compiled.  Using `uname` to determine
    the architecture of the Riak package on OSX isn't correct on
    OSX machines that report "i386" from `uname -m` but have Erlang
    compiled for 64bit.
    
    This method uses `file` to determine the architecture of the
    `erlc` binary that will be in the path of the build since Erlang
    is required to build Riak.  This way, the package architecture
    will match the erlang architecture everytime.
  2. @jaredmorrow

    Merge pull request #244 from basho/bs-riaknostic-1.3

    jaredmorrow authored
    Add riaknostic to riak builds
  3. @jaredmorrow

    Fix makefile targets so 'deps' doesn't get called for each devrel

    jaredmorrow authored
    Due to the structure of the targets, `make` couldn't figure
    out that `deps` was already called.  This causes `deps` (the
    longest operation) to be called each devrel slowing down
    the build considerably.
Commits on Nov 16, 2012
  1. @bsparrow435
  2. Revert "Remove `riak restart` since it never worked as advertised."

    Sean Cribbs authored
    This reverts commit 10fcc23.
  3. Merge pull request #243 from basho/sdc-remove-restart

    Sean Cribbs authored
    Remove `riak restart` since it never worked as advertised.
Commits on Nov 15, 2012
  1. @kellymclaughlin
  2. @jaredmorrow

    Make devrel and stagedevrel make commands more portable

    jaredmorrow authored
    The shell command 'seq' is not available on some *BSD systems
    including several OSX flavors.  Instead this uses 'awk'
    to perform the same task.  In addition the `gen_dev` script
    was changed to use bin/sh rather than bin/bash.
Commits on Nov 14, 2012
  1. @jaredmorrow

    Merge pull request #241 from basho/jem-devrel-portable

    jaredmorrow authored
    Make devrel and stagedevrel make commands more portable
  2. @beerriot
  3. @kellymclaughlin

    Remove legacy_keylisting config option from app.config template

    kellymclaughlin authored
    Fixes: RIAK239
    
    Legacy keylisting is being removed from riak_kv so the
    legacy_keylisting configuration option is now obsolete.
Commits on Nov 12, 2012
  1. @evanmcc

    Merge pull request #237 from basho/pevm-stagedevrel-fix

    evanmcc authored
    Fix stagedevrel, fix hanging close paren.
  2. @evanmcc
  3. @beerriot

    remove luke usage

    beerriot authored
    riak_pipe runs MapReduce queries now
Commits on Nov 10, 2012
  1. @evanmcc

    Merge pull request #236 from basho/pevm-N-devrel-port

    evanmcc authored
    Allow dynamic number of devrel nodes to be created
  2. @evanmcc
Commits on Nov 9, 2012
  1. @jaredmorrow
  2. @evanmcc

    remove old vars files

    evanmcc authored
  3. @evanmcc

    remove ee specific stuff

    evanmcc authored
  4. @evanmcc

    move EE pr 90/99 to OS

    evanmcc authored
Commits on Nov 8, 2012
  1. @jaredmorrow

    Merge branch '1.2'

    jaredmorrow authored
  2. @jaredmorrow

    Merge pull request #230 from basho/jsm-pkg-fixes

    jaredmorrow authored
    Embeds distro name into version tag.
Commits on Oct 22, 2012
  1. @jaredmorrow

    Properly exit on `/etc/init.d/riak status` command

    jaredmorrow authored
    When running `/etc/init.d/riak status`, if the status fails
    (Riak isn't running) not only should a message print out
    that states that fact, but also the exit status should be non-zero.
    
    This change addresses issue basho/riak#232
  2. @jaredmorrow

    Merge branch '1.2'

    jaredmorrow authored
  3. @jaredmorrow

    Merge branch 'riak223-remove-console-logging' into 1.2

    jaredmorrow authored
    Conflicts:
    	rel/vars.config
  4. @jaredmorrow

    Merge pull request #233 from basho/jem-debian-package-init-status

    jaredmorrow authored
    Properly exit on `/etc/init.d/riak status` command
  5. @jaredmorrow

    Properly exit on `/etc/init.d/riak status` command

    jaredmorrow authored
    When running `/etc/init.d/riak status`, if the status fails
    (Riak isn't running) not only should a message print out
    that states that fact, but also the exit status should be non-zero.
    
    This change addresses issue basho/riak#232
Commits on Oct 20, 2012
  1. @jaredmorrow
  2. @jaredmorrow

    Merge pull request #219 from jjuran/doc-fix/basic-setup/strike-comma

    jaredmorrow authored
    doc/basic-setup.txt:  Strike out-of-place comma
  3. @jaredmorrow

    Merge pull request #220 from jjuran/doc-fix/raw-http-howto/strike-comma

    jaredmorrow authored
    doc/raw-http-howto.txt:  Strike out-of-place comma
Commits on Oct 19, 2012
  1. @jaredmorrow

    Merge pull request #226 from basho/pevm_port_check

    jaredmorrow authored
    add port uniqueness checking
  2. @jaredmorrow

    Add tests and adjust `riak` script to read return codes

    jaredmorrow authored
    The `riak` script looked for output from `nodetool chkconfig`
    rather than return codes, which didn't allow for outputting
    warnings that shouldn't fail the startup.
    
    A more complete validation framework was put in `nodetool` so
    additional file tests can be added easily.
Commits on Oct 17, 2012
  1. @kellymclaughlin

    Merge branch '1.2'

    kellymclaughlin authored
    Conflicts:
    	rebar.config
  2. @kellymclaughlin
Something went wrong with that request. Please try again.