From: Richard W.M. Jones Date: Wed, 6 Apr 2016 22:21:34 +0000 (+0100) Subject: merging choo/git-annex trick/git-annex into git-annex X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=91a2aa21cfd2fe17284524d55594c08ad035b042;p=virt-v2v-test-cases-nonfree.git merging choo/git-annex trick/git-annex into git-annex --- 91a2aa21cfd2fe17284524d55594c08ad035b042 diff --cc 44b/844/SHA256E-s1297248256--22cccdc1d15b300facd5328a15d6f1df00b23fa7c27f7af33ca0eca175059940.ova.log index 0000000,f5c5554,a9957b3..bbb1b86 mode 000000,100644,100644..100644 --- a/44b/844/SHA256E-s1297248256--22cccdc1d15b300facd5328a15d6f1df00b23fa7c27f7af33ca0eca175059940.ova.log +++ b/44b/844/SHA256E-s1297248256--22cccdc1d15b300facd5328a15d6f1df00b23fa7c27f7af33ca0eca175059940.ova.log @@@@ -1,0 -1,1 -1,3 +1,4 @@@@ ++ 1429727374.762751s 1 634ccc92-a730-4494-9503-f5e822fb7fbb + +1429729672.99284s 1 baab76c0-62d0-4cea-b63b-6898b2a50eb8 ++ 1429729673.03432s 1 baab76c0-62d0-4cea-b63b-6898b2a50eb8 ++ 1429809323.281847s 1 e6e26ddf-dbb4-423d-a7f6-ead24d6ba5b3 diff --cc ba4/2a9/SHA256E-s5406133760--1ac30905506d399171a52375fb9bf6744f981e5b8ccd14175198f9cde3e673e4.ova.log index 0000000,7e2d600,b9c5cba..68bb54f mode 000000,100644,100644..100644 --- a/ba4/2a9/SHA256E-s5406133760--1ac30905506d399171a52375fb9bf6744f981e5b8ccd14175198f9cde3e673e4.ova.log +++ b/ba4/2a9/SHA256E-s5406133760--1ac30905506d399171a52375fb9bf6744f981e5b8ccd14175198f9cde3e673e4.ova.log @@@@ -1,0 -1,1 -1,3 +1,4 @@@@ ++ 1429727407.908513s 1 634ccc92-a730-4494-9503-f5e822fb7fbb + +1429736111.144936s 1 baab76c0-62d0-4cea-b63b-6898b2a50eb8 ++ 1429736111.3963s 1 baab76c0-62d0-4cea-b63b-6898b2a50eb8 ++ 1429817144.4251s 1 e6e26ddf-dbb4-423d-a7f6-ead24d6ba5b3