summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-07-04 16:40:05 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-07-04 16:40:05 -0400
commit7d8d873873424326026dc15914787648e83564f4 (patch)
tree533f2b0337313b54213659dfadd451493aaf7f2a
parent380d08c1cbc25db48958ee9e80a0cbd0169d1eb4 (diff)
parent873410df6a12e77491c12627b2f54c76eaaeb88c (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/bugs/runs_of_of_memory_adding_2_million_files/comment_4_e991986eb8ae49d2e69f7ed7fd61485f._comment8
-rw-r--r--doc/bugs/runs_of_of_memory_adding_2_million_files/comment_5_241ad838135a7a377374ca9ba90aec5c._comment8
2 files changed, 16 insertions, 0 deletions
diff --git a/doc/bugs/runs_of_of_memory_adding_2_million_files/comment_4_e991986eb8ae49d2e69f7ed7fd61485f._comment b/doc/bugs/runs_of_of_memory_adding_2_million_files/comment_4_e991986eb8ae49d2e69f7ed7fd61485f._comment
new file mode 100644
index 000000000..40ff69d05
--- /dev/null
+++ b/doc/bugs/runs_of_of_memory_adding_2_million_files/comment_4_e991986eb8ae49d2e69f7ed7fd61485f._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.55"
+ subject="comment 4"
+ date="2014-07-04T19:38:18Z"
+ content="""
+While I fixed the problem analized above, it still runs out of memory in the same place. Must be other strictness problems..
+"""]]
diff --git a/doc/bugs/runs_of_of_memory_adding_2_million_files/comment_5_241ad838135a7a377374ca9ba90aec5c._comment b/doc/bugs/runs_of_of_memory_adding_2_million_files/comment_5_241ad838135a7a377374ca9ba90aec5c._comment
new file mode 100644
index 000000000..41382e1c2
--- /dev/null
+++ b/doc/bugs/runs_of_of_memory_adding_2_million_files/comment_5_241ad838135a7a377374ca9ba90aec5c._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.55"
+ subject="comment 5"
+ date="2014-07-04T19:53:43Z"
+ content="""
+The other memory leak is in getJournalFiles itself!
+"""]]