diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-03-24 20:44:07 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-03-24 20:44:07 +0000 |
| commit | efbb23837761bda6c526baca1b5ea72d227e2ae3 (patch) | |
| tree | 728199c73595103d7561dd9d441bdbe1845c6331 /doc/legacy/hacker-guide | |
| parent | a58b023443b7a2ec089c45bf35bde2b0108aa19b (diff) | |
| parent | 17454dfea9f3c4d47fcf0b5370a6155f639c8aeb (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'doc/legacy/hacker-guide')
| -rw-r--r-- | doc/legacy/hacker-guide/call-stub.txt | 2 | ||||
| -rw-r--r-- | doc/legacy/hacker-guide/replicate.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/legacy/hacker-guide/call-stub.txt b/doc/legacy/hacker-guide/call-stub.txt index 021037a35..cab8e4d55 100644 --- a/doc/legacy/hacker-guide/call-stub.txt +++ b/doc/legacy/hacker-guide/call-stub.txt @@ -1,6 +1,6 @@ creating a call stub and pausing a call --------------------------------------- -libglusterfs provides seperate API to pause each of the fop. parameters to each API is +libglusterfs provides separate API to pause each of the fop. parameters to each API is @frame - call frame which has to be used to resume the call at call_resume(). @fn - procedure to call during call_resume(). NOTE: @fn should exactly take the same type and number of parameters that diff --git a/doc/legacy/hacker-guide/replicate.txt b/doc/legacy/hacker-guide/replicate.txt index 133c72afa..ad5b352a8 100644 --- a/doc/legacy/hacker-guide/replicate.txt +++ b/doc/legacy/hacker-guide/replicate.txt @@ -148,7 +148,7 @@ Each of the four major groups has its own algorithm: definitive and replicate its attributes on children. - If entry is a directory: - - Consider the entry with the higest AFR_ENTRY_PENDING number as + - Consider the entry with the highest AFR_ENTRY_PENDING number as definitive and replicate its contents on all children. - If any two entries have non-matching types (i.e., one is file and |