user/map/catlfish.git, branch external-merge-rebased Magnus' CT repository Break include dependency on plop.hrl 2014-10-22T14:41:41+00:00 Magnus Ahltorp map@kth.se 2014-10-21T15:16:50+00:00 668a24fd4043355547ef2694d47b0f0c380c424c 






Added lager for logging
2014-10-22T14:41:41+00:00

Magnus Ahltorp
map@kth.se

2014-10-21T14:03:54+00:00

77f5f5fb1396609803e3b1b13f39c4f3498a6612












Added external merging support
2014-10-22T14:41:41+00:00

Magnus Ahltorp
map@kth.se

2014-10-20T12:33:41+00:00

ba5e731d2998e8200121d9f96870a2c54889a6c4












Add copyright KTH to LICENSE.
2014-10-22T14:41:41+00:00

Linus Nordberg
linus@nordberg.se

2014-10-13T07:41:40+00:00

f0af87c5851f8c3c244eb5f5ac7921dc9a672c5a












Add copyright and licensing information.
2014-10-15T14:12:32+00:00

Linus Nordberg
linus@nordberg.se

2014-10-15T14:12:32+00:00

92d8435250a9d8d498e129f91e64045bfd30e7b9

After offline discussions with Magnus Ahltorp.





After offline discussions with Magnus Ahltorp.







Fix bug in get-entries limitation of entries.
2014-10-09T22:04:14+00:00

Linus Nordberg
linus@nordberg.se

2014-10-09T22:04:14+00:00

f3f35b9a4140830e97b5382bc22fc2e78be7124b












Use proper return value format for plop:inclusion_and_entry().
2014-10-09T22:01:50+00:00

Linus Nordberg
linus@nordberg.se

2014-10-09T22:01:50+00:00

25041bc1c1bcd264ae97f8d0506ccec43e75a253












Limit get-entries to 1000 entries at the time.
2014-10-09T16:31:59+00:00

Linus Nordberg
linus@nordberg.se

2014-10-09T16:31:59+00:00

7bd137827bb60481569f26bed3028398a5e5aa06












Merge remote-tracking branch 'refs/remotes/map/fsync4' into origin-master
2014-10-08T14:22:05+00:00

Linus Nordberg
linus@nordberg.se

2014-10-08T14:22:05+00:00

6ddb0363c5c9bb147f9a4fe0ba683bdba20b5389

Conflicts:
	src/catlfish.erl





Conflicts:
	src/catlfish.erl







Merge branch 'plop-if-cleanup2' into origin-master
2014-10-08T13:41:38+00:00

Linus Nordberg
linus@nordberg.se

2014-10-08T13:41:38+00:00

e3fd2e3fc202ce18b90ac4ca96ac8264bed79569