Second try: large table mods merged against current treilly master

[dhentchel]

Create a new repo, made your repo an upstream, fetched, merged, committed and pushed.
This should be the one.

d.

[dhentchel]

These addition commits pull in all the latest changes from the treilly ycsb repo, and propagate the int->long conversion up to the Client operation and record count parameters.

[treilly-nuodb]

I can't merge this pull request b/c there are conflicts.

[dhentchel]

I don't get it - I don't see any conflicts and I'm not sure how to merge
into your changes.

Pull/push shows no conflicts - if you didn't make any changes to master,
how did my clone get out of date?

On Thu, Apr 25, 2013 at 11:14 AM, treilly-nuodb [email protected]:

I can't merge this pull request b/c there are conflicts.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/3#issuecomment-17013095
.

David Hentchel

Performance Engineer

www.nuodb.com

(617) 803 - 1193

[dhentchel]

Not sure where this is standing right now. I'm happy to re-create my fork
and do a clean merge, if that'll make it work.

My current fork 'seems' to be up to date, not sure why it wouldn't show
changes from the original repo. Here's what I see in git log:

commit 9fd0bb0
Author: David Hentchel [email protected]
Date: 2013-04-03 12:04:05 -0400

Converted operation count and record count to long

commit bf0fcf0
Author: David Hentchel [email protected]
Date: 2013-04-03 09:19:58 -0400

Removed unused imports

commit ed0dfc6
Author: Tommy Reilly [email protected]
Date: 2013-01-11 13:45:09 -0500

Add a partitioned version of focusedzipfian, good for warmup or apples

to apples comparison with sharded databases

commit b89e978
Merge: 94b7343 5262070
Author: David Hentchel [email protected]
Date: 2013-04-01 19:54:34 -0400

Initial merge of twilli3141 large table mods

commit 94b7343
Author: David Hentchel [email protected]
Date: 2013-04-01 14:46:48 -0400

Changed FocusedZipfian to use long, tests run successfully

commit cbe4d37
Author: Terry Williams [email protected]
Date: 2013-03-27 15:03:44 -0700

Enable larger tables.

commit 5262070
Author: Terry Williams [email protected]
Date: 2013-03-27 15:03:44 -0700

Enable larger tables.

commit d15d693
Author: Dave Hentchel [email protected]
Date: 2013-01-04 15:19:13 -0500

Add StatusReporter plugin and fix premature counter clearing

commit 9344668

dave

On Thu, Apr 25, 2013 at 2:40 PM, David Hentchel [email protected] wrote:

I don't get it - I don't see any conflicts and I'm not sure how to merge
into your changes.

Pull/push shows no conflicts - if you didn't make any changes to master,
how did my clone get out of date?

On Thu, Apr 25, 2013 at 11:14 AM, treilly-nuodb [email protected]:

I can't merge this pull request b/c there are conflicts.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/3#issuecomment-17013095
.

David Hentchel

Performance Engineer

www.nuodb.com

(617) 803 - 1193

David Hentchel

Performance Engineer

www.nuodb.com

(617) 803 - 1193