Commit Graph

2189 Commits

Author SHA1 Message Date
Jon Meredith
4a5d42c283 Merge pull request #833 from basho/merge-forward/zl/riak/2.0tomaster
Merge forward/zl/riak/2.0tomaster
2015-08-13 17:06:06 -06:00
Zeeshan Lakhani
4b9c91bfbe Merge remote-tracking branch 'origin/riak/2.0' into merge-forward/zl/riak/2.0tomaster 2015-08-13 18:36:12 -04:00
Jon Meredith
2e868da4ca Merge pull request #829 from basho/jdm/2.1.2rc2-that-should-be-in-2.0
Jdm/2.1.2rc2 that should be in 2.0
2015-08-13 16:26:54 -06:00
Jon Meredith
0dc520a346 Merge pull request #830 from basho/bugfix/bch/riak-control-amended
Fix riak_control to check the correct devrel version
2015-08-13 16:26:35 -06:00
John Daily
fd9c553454 Merge pull request #832 from basho/bugfix/jrd/deterministic-join-failure
Make this test deterministic whether it likes it or not: intercept init
2015-08-13 17:36:36 -04:00
John R. Daily
2ce3a57b1b Make this test deterministic whether it likes it or not: intercept init 2015-08-13 17:33:38 -04:00
Zeeshan Lakhani
e003ca8152 Merge pull request #825 from basho/zl/yz-updates-for-riak/2.0
Zl/yz updates for riak/2.0
2015-08-13 14:45:23 -04:00
Zeeshan Lakhani
6fda68a048 switcheroo
(cherry picked from commit ae7815d57d)
2015-08-13 13:07:40 -04:00
Zeeshan Lakhani
499a7b1c48 add some clarity to ordering of socket close and such
(cherry picked from commit 13408eb9e2)
2015-08-13 13:07:40 -04:00
Zeeshan Lakhani
ba60249fc3 * clean-up yokozuna_rt for reusability
* add new types for dialyzer
* add test to reload schema and overwrite it on type change
* test nested search (e.g. nested json objects)
* test re-putting fields, include crdt map workaround, discussed in
https://gist.github.com/sdebnath/36c235e042cb35db7d1f
* increase aae concurrency for core_prop test

(cherry picked from commit 16ce998e3f)
2015-08-13 13:07:40 -04:00
Jon Meredith
0513ec7f1f Merge pull request #828 from basho/bugfix/jrd/join-retry
Drop use of wait_until for join
2015-08-13 11:06:15 -06:00
Brett Hazen
be89186090 Fix riak_control to check the correct devrel version 2015-08-12 19:50:50 -06:00
John R. Daily
a61583ef5d (facepalm) 2015-08-12 19:54:08 -04:00
John R. Daily
4257898621 wait_until is too limiting 2015-08-12 18:51:17 -04:00
Brett Hazen
4ddbd95460 Merge pull request #821 from basho/bugfix/bch/cleanup_verify_membackend
Update verify_memorybackend for RIAK-2061
2015-08-12 15:22:52 -06:00
Brett Hazen
0122a475e8 Merge pull request #817 from basho/bugfix/bch/update_riak_control_versions
Fix riak_control and riak_control_authentication for Riak 2.1+
2015-08-12 15:20:39 -06:00
John Daily
4a7c4b01d3 Merge pull request #782 from basho/rdb/gh-riak-727
Add failing test for github issue riak-727
2015-08-12 15:17:47 -06:00
Brett Hazen
8ada302b69 Merge pull request #821 from basho/bugfix/bch/cleanup_verify_membackend
Update verify_memorybackend for RIAK-2061
2015-08-12 11:34:59 -06:00
John Daily
ac42485583 Merge pull request #826 from basho/bugfix/jdm/cluster-does-not-converge-race
Bugfix/jdm/cluster does not converge race
2015-08-12 12:38:44 -04:00
John Daily
987f9826cf Merge pull request #782 from basho/rdb/gh-riak-727
Add failing test for github issue riak-727
2015-08-11 19:44:13 -04:00
John R. Daily
d3b5956224 Switch to wait_until for error handling during a staged join 2015-08-11 19:41:28 -04:00
John R. Daily
dee00a3f9c Need a much longer delay to get reliably successful failures 2015-08-11 19:35:28 -04:00
John R. Daily
5ba9cf56ae Add retry for join error 2015-08-11 00:23:35 -04:00
John R. Daily
6f29ae93f6 Test reliably passes locally, do not need gossip, just a slow riak_core start 2015-08-10 23:35:24 -04:00
John R. Daily
77227de121 Force delay to provoke cluster join error 2015-08-10 15:56:25 -04:00
Zeeshan Lakhani
346a651326 Merge pull request #820 from basho/tests/zl/yz-extractors-bit-o-cleanup-but-cant-repro-flappiness
add some clarity to ordering of socket close and such
2015-08-10 10:13:25 -04:00
Brett Hazen
65d55654d3 Merge pull request #817 from basho/bugfix/bch/update_riak_control_versions
Fix riak_control and riak_control_authentication for Riak 2.1+
2015-08-07 10:47:25 -06:00
Jon Meredith
2f03579305 Reproduce build cluster race with capabilities. 2015-08-07 10:01:23 -06:00
Fred Dushin
662fa8e3c3 Merge pull request #824 from basho/bugfix/zl/big-dummy-blame-zeeshan-bucket-index-swap
switcheroo
2015-08-05 11:44:40 -04:00
Zeeshan Lakhani
ae7815d57d switcheroo 2015-08-05 11:32:58 -04:00
Brett Hazen
aa3f05352e Merge pull request #815 from basho/feature/bch/update-rtdev-versions
Update Documentation and Build Scripts for Riak 2.1
2015-08-04 09:33:33 -06:00
Brett Hazen
ff1f73c821 Update versions built 2015-08-04 02:42:01 +00:00
Mark Allen
c192f92faf Make release tags BASH variable 2015-08-03 14:41:28 -05:00
Brett Hazen
920ddf7c03 Update R16 version to OTP_R16B02_basho9 tag 2015-08-03 19:18:38 +00:00
Brett Hazen
659f96ae34 Build Basho-patched Erlang and add tweaks for CentOS 2015-08-03 19:10:30 +00:00
Brett Hazen
2e1290f17a Merge pull request #819 from basho/feature/mra/rtdev-osx
If we're building on OS X, don't build HiPE or ODBC connector
2015-08-03 10:06:53 -06:00
Mark Allen
c746eb9290 Make the erlang builds more official 2015-07-31 21:09:48 -05:00
Mark Allen
b44a6702eb Merge branch 'feature/bch/update-rtdev-versions' of github.com:/basho/riak_test into feature/bch/update-rtdev-versions 2015-07-31 16:26:50 -05:00
Mark Allen
3c9fae3241 Make the release build process more reliable
Many changes here:
* Only download source once from the Interwebs
* Skip a directory if it's already built
* Use locked-deps when appropriate
2015-07-31 16:23:40 -05:00
Brett Hazen
4034777d0c Change verify_memorybackend to use calls to core and kv to determine
memory used, instead of a brittle parsing of data structures
2015-07-31 14:48:45 -06:00
Zeeshan Lakhani
13408eb9e2 add some clarity to ordering of socket close and such 2015-07-31 16:43:03 -04:00
Mark Allen
1e680333dd If Darwin, don't build hipe/odbc 2015-07-30 17:10:16 -05:00
Zeeshan Lakhani
875e50be41 Merge pull request #800 from basho/add-tests/zl/test-reload-schema-field-funniness
Add new test for schema reload/overwrite
2015-07-30 12:25:08 -04:00
Brett Hazen
73c24ab861 Update the URL for pulling down kerl 2015-07-30 09:39:22 -06:00
Brett Hazen
a88a20fe25 Merge pull request #791 from basho/bugfix/sdc/667-mixed-auto-reconnect
Hopefully fix the disconnection issue in the riak667_mixed test
2015-07-29 15:28:10 -06:00
Fred Dushin
fa7224a898 Merge pull request #812 from basho/bugfix/fd/RIAK-1850
Test fix for bad_match during handoff with write_once buckets
2015-07-29 17:00:03 -04:00
Brett Hazen
24c63feba5 Merge pull request #816 from basho/bugfix/bch/update_membackend_regex
Patch verify_membackend test to run in 2.1+
2015-07-28 11:52:33 -06:00
Doug Rohrer
7e7cb73d55 Add rt:wait_until_bucket_type_visible to avoid floppiness in test - verify would fail because, while handoff had completed, the bucket type information hadn't yet been gossiped to the new node. 2015-07-28 11:03:45 -04:00
Brett Hazen
98c6832367 Switch check_put_delete/1 to use a range of acceptable sizes 2015-07-27 15:27:52 -06:00
Brett Hazen
f349c028d9 Fix riak_control and riak_control_authentication for Riak 2.1+
- Use the actual version string (e.g. riak_ee-2.1.2) of devrel
  instead of "current", "previous", "legacy" to determine which
  tests to run
- Add rt:get_version/1 to find the version of devrels other than
  "current"
2015-07-25 21:21:42 -06:00