Commit graph

26419 commits

Author SHA1 Message Date
Joey Hess
afb7a22176
Merge branch 'master' of ssh://git-annex.branchable.com 2016-01-05 12:01:59 -04:00
Yaroslav Halchenko
bfb68c2245
BF: added forgotten commas for new build-depends 2016-01-05 12:01:35 -04:00
Jelmer Vernooij
f09df3e226
Add Munin module.
Signed-off-by: Jelmer Vernooij <jelmer@jelmer.uk>
2016-01-05 12:01:35 -04:00
CandyAngel
14c5c24c40 Added a comment 2016-01-05 11:41:13 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
d45344e5c4 2016-01-05 11:23:36 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
10aecc58ab Added a comment 2016-01-05 11:09:07 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
1d6d7a6e16 2016-01-05 02:20:14 +00:00
umeboshi
54c569ee2e Added a comment 2016-01-04 21:26:05 +00:00
sameerds
34408b48ec 2016-01-03 17:39:29 +00:00
eigengrau
621b903321 Added a comment 2016-01-03 07:52:36 +00:00
umeboshi
e3105b95e2 Fix formatting (grrr) 2016-01-02 23:29:38 +00:00
umeboshi
f234306a8a added ifarchive.org mirror. 2016-01-02 23:23:49 +00:00
umeboshi
d63194fc36 removed 2016-01-02 23:13:43 +00:00
umeboshi
ab0494206c Added a comment 2016-01-02 23:13:15 +00:00
umeboshi
bc4ff0c71f Added a comment 2016-01-02 23:09:53 +00:00
umeboshi
628325f45b 2016-01-02 22:45:54 +00:00
umeboshi
a06f3e5014 Added a comment 2016-01-02 21:02:51 +00:00
umeboshi
75a28aae43 2016-01-02 20:15:38 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
91ba1f0405 Added a comment 2016-01-02 01:57:45 +00:00
ColinW
bd1974e98d 2016-01-01 22:53:23 +00:00
ColinW
c823d6f7de Added a comment: Re Comment 1 2016-01-01 22:39:14 +00:00
Joey Hess
c626822679
devblog 2016-01-01 17:50:48 -04:00
Joey Hess
ef474f0da7
fixed 2016-01-01 17:46:36 -04:00
Joey Hess
92823d8413
analysis 2016-01-01 17:17:57 -04:00
Joey Hess
6c03a091ec
response 2016-01-01 16:41:48 -04:00
Joey Hess
650f9ddd8b
response 2016-01-01 16:37:31 -04:00
Joey Hess
121659576b
info --json: Improve json for "backend usage", using a nested object with fields for each backend instead of the previous weird nested lists. This may break existing parsers of this json output, if there were any. 2016-01-01 16:33:05 -04:00
Joey Hess
09a2fcb643
info: Fix "backend usage" numbers, which were counting present keys twice.
Let's just count the referenced keys for that, and not present keys at all.
2016-01-01 16:13:16 -04:00
Joey Hess
67532c7b49
response 2016-01-01 16:07:38 -04:00
Joey Hess
b1373f0d15
update 2016-01-01 16:02:11 -04:00
Joey Hess
ec28151722
improve data type 2016-01-01 15:56:24 -04:00
Joey Hess
f7256842cc
wait for git lstree to exit 2016-01-01 15:51:29 -04:00
Joey Hess
70fee8208c
remove old TODO 2016-01-01 15:43:13 -04:00
Joey Hess
eb2bf9d768
response 2016-01-01 15:39:13 -04:00
Joey Hess
e10731c6ee
Merge branch 'master' of ssh://git-annex.branchable.com 2016-01-01 15:22:51 -04:00
Joey Hess
5b7fea0c31
remporarily disable v6 unlocked test pass while it's failing 2016-01-01 15:22:11 -04:00
Joey Hess
9b99595473
only do scan when there's a branch, not in freshly created new repo 2016-01-01 15:16:16 -04:00
Joey Hess
e9a33088e8
reorder
May be unlocked files pulled from elsewhere, but converting from direct
mode will add more. So, do the scan for them first, since it empties
anything currently in the database.
2016-01-01 15:15:15 -04:00
Joey Hess
f36f24197a
scan for unlocked files on init/upgrade of v6 repo 2016-01-01 15:09:42 -04:00
Joey Hess
b03a24dc10
update 2016-01-01 14:26:09 -04:00
Joey Hess
43b1333216
switch to using main ingest code
Fixes at least one bug, in populating existing worktree files that use the
same key that's ingested.
2016-01-01 14:16:40 -04:00
Joey Hess
4eab4bdb01
started working on testing v6 unlocked files
Many failures.
2016-01-01 14:04:43 -04:00
Joey Hess
a2c056df65
convert isPointerFile from Annex to IO 2016-01-01 13:22:38 -04:00
markus@c65ad4f0b6624673047e959218d058eb73e7ff15
6cb5cb039d 2016-01-01 13:41:17 +00:00
Joey Hess
00f0411d12
Merge branch 'master' of ssh://git-annex.branchable.com 2015-12-31 13:30:40 -04:00
Joey Hess
7822164b0f
improve name of keys database lock file 2015-12-31 13:28:18 -04:00
lars@20e4ed7efd4581b7e490713058bd5f94e43488a1
913fb77e5b 2015-12-30 21:27:32 +00:00
Joey Hess
4be2b57606
add test: conflict resolution (mixed locked and unlocked file) 2015-12-30 16:36:39 -04:00
Joey Hess
eff33d33f0
Merge branch 'master' of ssh://git-annex.branchable.com 2015-12-30 15:21:40 -04:00
Joey Hess
0b8bba8031
test suite 100% pass in v6, finally!
Set annex.largefiles when adding the conflicting non-annexed file,
otherwise it would be added as an annexed file.
2015-12-30 15:12:45 -04:00