Commit b4069cc8 authored by Job Vranish's avatar Job Vranish
Browse files

Merge branch 'develop' of github.com:Seagate/kinetic-c into develop

parents b949cee2 050745df

.travis.yml

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ os: 
compiler:

  - clang

  - gcc

install:

before_script:

  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y

  - sudo apt-get update -qq

  - sudo apt-get install -y gcc-4.8

  - if [ $CC == 'gcc' ]; then export CC=gcc-4.8; fi;

  - bundle install

script:

  - make start_simulator

test/system/test_system_stress.c

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ void test_kinetic_client_throughput_for_small_sized_objects(void) 
{

    srand(time(NULL));

    for (uint32_t i = 0; i < 2; i++) {

        KineticClient * client = KineticClient_Init("stdout", 1);

        KineticClient * client = KineticClient_Init("stdout", 0);

        run_tests(client);

        KineticClient_Shutdown(client);

    }