good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
dd8a6268
Unverified
Commit
dd8a6268
authored
Oct 30, 2017
by
Péter Szilágyi
Committed by
GitHub
Oct 30, 2017
Browse files
Options
Downloads
Plain Diff
Merge pull request #15398 from ferhatelmas/core-swarm-typo
core, swarm: typo fixes
parents
8d434f6a
07e8c177
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
core/tx_journal.go
+1
-1
1 addition, 1 deletion
core/tx_journal.go
swarm/api/http/error.go
+1
-1
1 addition, 1 deletion
swarm/api/http/error.go
swarm/api/http/error_test.go
+1
-1
1 addition, 1 deletion
swarm/api/http/error_test.go
swarm/storage/pyramid.go
+2
-2
2 additions, 2 deletions
swarm/storage/pyramid.go
with
5 additions
and
5 deletions
core/tx_journal.go
+
1
−
1
View file @
dd8a6268
...
...
@@ -68,7 +68,7 @@ func (journal *txJournal) load(add func(*types.Transaction) error) error {
}
defer
input
.
Close
()
// Temporaril
l
y discard any journal additions (don't double add on load)
// Temporarily discard any journal additions (don't double add on load)
journal
.
writer
=
new
(
devNull
)
defer
func
()
{
journal
.
writer
=
nil
}()
...
...
This diff is collapsed.
Click to expand it.
swarm/api/http/error.go
+
1
−
1
View file @
dd8a6268
...
...
@@ -72,7 +72,7 @@ func initErrHandling() {
//ShowMultipeChoices is used when a user requests a resource in a manifest which results
//in ambiguous results. It returns a HTML page with clickable links of each of the entry
//in the manifest which fits the request URI ambiguity.
//For example, if the user requests bzz:/<hash>/read and that manifest contain
e
s entries
//For example, if the user requests bzz:/<hash>/read and that manifest contains entries
//"readme.md" and "readinglist.txt", a HTML page is returned with this two links.
//This only applies if the manifest has no default entry
func
ShowMultipleChoices
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
,
list
api
.
ManifestList
)
{
...
...
This diff is collapsed.
Click to expand it.
swarm/api/http/error_test.go
+
1
−
1
View file @
dd8a6268
...
...
@@ -132,7 +132,7 @@ func TestJsonResponse(t *testing.T) {
}
if
!
isJSON
(
string
(
respbody
))
{
t
.
Fatalf
(
"Expected re
p
sonse to be JSON, received invalid JSON: %s"
,
string
(
respbody
))
t
.
Fatalf
(
"Expected res
p
onse to be JSON, received invalid JSON: %s"
,
string
(
respbody
))
}
}
...
...
This diff is collapsed.
Click to expand it.
swarm/storage/pyramid.go
+
2
−
2
View file @
dd8a6268
...
...
@@ -27,7 +27,7 @@ import (
/*
The main idea of a pyramid chunker is to process the input data without knowing the entire size apriori.
For this to be achieved, the chunker tree is built from the ground up until the data is exhausted.
This opens up new aveneus such as easy append and other sort of modifications to the tree therby avoiding
This opens up new aveneus such as easy append and other sort of modifications to the tree ther
e
by avoiding
duplication of data chunks.
...
...
@@ -451,7 +451,7 @@ func (self *PyramidChunker) prepareChunks(isAppend bool, chunkLevel [][]*TreeEnt
}
}
// Data ended in chunk boundry.. just signal to start bulding tree
// Data ended in chunk bound
a
ry.. just signal to start bulding tree
if
n
==
0
{
self
.
buildTree
(
isAppend
,
chunkLevel
,
parent
,
chunkWG
,
jobC
,
quitC
,
true
,
rootKey
)
break
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment