f15ec3fe92
Merge "pkg/deploy/gce: lib + tool to deploy on Google Cloud"
2014-11-27 15:44:32 +00:00
99fe925efc
pkg/deploy/gce: lib + tool to deploy on Google Cloud
...
http://camlistore.org/issue/531
Change-Id: I69ffe0544341d380bb844aef1dcca8a1ae441ea7
2014-11-26 22:50:27 +01:00
e64066d0cf
Merge branch 'master' of https://camlistore.googlesource.com/camlistore
2014-11-26 11:40:02 -08:00
09114a9089
Enable HTTP/2 support.
...
Change-Id: I79b5cc06f502478eb8cdc1e044da97e3968bb856
2014-11-26 08:45:01 -08:00
82be61629f
Update github.com/bradfitz/http2 to 36d9a67b6d4
...
Exports the NPN constant.
Change-Id: I1f7570cc46579e76b215f10162a742f10ca766cd
2014-11-26 08:44:47 -08:00
1a26ffa382
Import github.com/bradfitz/http2 at 8ec321e3925b
...
Change-Id: Ia75786f7d8e635e88b4c8821cb32e19d24b463f2
2014-11-26 07:33:24 -08:00
54b1925847
Merge "DirReader.Readdir incorrectly logs the contents of err where it should really log the contents of res.err"
2014-11-24 18:36:16 +00:00
7ffbb7433a
C+A: add Alessandro Arzilli (Individual CLA)
...
Change-Id: I9bd7d3aca8a0b7e0793e9b6ef2e78a922d697f23
2014-11-24 10:35:13 -08:00
b92df8065d
DirReader.Readdir incorrectly logs the contents of err where it should really log the contents of res.err
...
Change-Id: Ic607d823af4b6147a54f896ffabaabf67b7b1c02
2014-11-24 18:41:50 +01:00
76405b796c
netutil: minor doc and style tweaks
...
Change-Id: I9c5706d62dc7c56785c95a444cc2bb3da1d8e571
2014-11-23 07:43:09 -08:00
32bdf89105
Merge "netutil additions"
2014-11-23 15:24:24 +00:00
89e45a6240
Merge "pkg: fix various vet reports"
2014-11-22 23:59:33 +00:00
0d4c3d2ed3
C+A: add Emil Hessman (Individual CLA)
...
Change-Id: I81736f64bbafaeab5d9257bbe916b3a53e4911d5
2014-11-22 15:59:16 -08:00
21a61dad40
Merge "index,camtool: try and cope better with broken exif"
2014-11-18 15:24:20 +00:00
958688ce68
Merge "ui: updates to file upload dialog"
2014-11-18 08:30:28 +00:00
5020c59dcb
Merge "Dockerfile for an nginx SPDY proxy"
2014-11-17 16:17:14 +00:00
4c53a1cd27
ui: updates to file upload dialog
...
-display total/transferred bytes rather than num files
-upload is now context sensitive if currently viewing a set
-updated closure dependencies
https://code.google.com/p/camlistore/issues/detail?id=336
https://code.google.com/p/camlistore/issues/detail?id=504
Change-Id: I8dee1ee2711c06dfdc9d59e8d0fa0e4ebc641092
2014-11-16 15:31:08 +01:00
4ed9ebb9fd
Dockerfile for an nginx SPDY proxy
...
We can enable this once the changes to gce/create.go are in.
https://code.google.com/p/camlistore/issues/detail?id=534
Change-Id: I7ea77bf9b09a2f6d91e4f5e228320fa97d54dfa2
2014-11-16 14:00:52 +00:00
3d60ad5f3b
Merge "dockertest: automatically clean up volumes on removal"
2014-11-15 00:44:02 +00:00
200a5cbcde
search: context.Context stored in parser
...
Change-Id: I4e7986e7f27c9cf1115e7e251a9e87ae506134c5
2014-11-13 21:17:24 +01:00
346e61448e
Merge "Generate self-signed certs with the correct hostname."
2014-11-13 16:18:50 +00:00
4e39af1086
Generate self-signed certs with the correct hostname.
...
This change makes gce/create.go generate a self-signed certificate
with the hostname from the -hostname argument and upload it to GCS
before creating a new camlistore instance.
It also makes camlistored use baseURL to figure out the hostname
when generating its self-signed certificate.
Change-Id: I64f85853dab34a7ce95e5d5997e58f2e5da43496
2014-11-13 15:53:40 +00:00
e8ffb9a66c
pkg: fix various vet reports
...
Change-Id: I0b7fa09849650fe696e59ad5c5c73a034ab80faa
2014-11-12 23:25:53 +01:00
cee3729806
Merge "test/integration: test for camget file -contents"
2014-11-12 19:28:18 +00:00
dabca278be
test/integration: test for camget file -contents
...
Also tests that we don't bother fetching if we already have the file.
http://camlistore.org/issue/526
Change-Id: I852b63051daecf82e2376ca0683abffb73f47393
2014-11-12 20:11:04 +01:00
bb4ca559e4
Merge "make.go: copy the correct binary when cross-compiling camlistored for docker"
2014-11-11 21:04:46 +00:00
d35ac9981c
make.go: copy the correct binary when cross-compiling camlistored for docker
...
Change-Id: I40c8fed24bea62fd29863fc02f3e780fd73f903c
2014-11-11 18:18:30 +00:00
9990b79616
Merge "test/integration: RunCmd must write to buffers even in verbose mode"
2014-11-10 21:46:11 +00:00
37d256af3d
Merge "100M benchmark for localdisk and diskpacked"
2014-11-10 21:45:40 +00:00
cc079cff2d
test/integration: RunCmd must write to buffers even in verbose mode
...
Otherwise in verbose mode stdout.String() and stderr.String() would be
always empty.
Change-Id: I6be3adb8905865d99af07595a7f446812b545338
2014-11-10 22:44:26 +01:00
32eb403c15
100M benchmark for localdisk and diskpacked
...
Change-Id: If46c3a710e5ef370ed8e1cfe166ab789ef0d206c
2014-11-10 20:03:01 +01:00
d7e5128bbe
Merge "camget: actually check size of file on server"
2014-11-10 18:18:05 +00:00
fda1399e9c
index,camtool: try and cope better with broken exif
...
http://camlistore.org/issue/493
Change-Id: I40aebd67252cf82a3a5a143af6c258d7ed2aecda
2014-11-10 19:05:35 +01:00
1d0ad00bdc
Merge "client: use index expression over rename map"
2014-11-10 16:43:20 +00:00
87e6815d62
netutil additions
...
Adds ListenOnLocalRandomPort and make Localhost more robust.
Change-Id: Id6416f7ae5c35fb247035ecb0021f3978ff3480e
2014-11-09 11:53:47 +01:00
3e4825a1c3
fs: correct the permission bit setting
...
Replace "executeBit" with "n.attr.Mode & 0100" in "0400 & executeBit".
The result is "0400 & n.attr.Mode & 0100" which is always 0. So
"n.attr.Mode" is always 0 after the assignment. The last two "&" should be
"|" in the assignment.
Change-Id: Iaeff864f330b9db07b8a3124b5c28ba1a3469e69
2014-11-09 13:53:23 +08:00
351b4f9726
client: use index expression over rename map
...
Use index expression instead of loop.
Change-Id: I26b85e239a227f234fa7432bf7444b6c73e949ba
2014-11-09 10:28:35 +08:00
3374899d40
Merge branch 'master' of https://camlistore.googlesource.com/camlistore
2014-11-08 18:17:20 -03:00
dedfeaff29
strutil: add IsPlausibleJSON
...
Use it in camtool search, and for https://camlistore-review.googlesource.com/#/c/2888/
Change-Id: Ibae0b4aa346cc8c18ff6a4b4eef994cfddd42dda
2014-11-08 18:16:47 -03:00
bb19aacd73
Merge "camput: use Errorf to print critical errors even when non-verbose"
2014-11-08 19:02:46 +00:00
755cf0eb0f
Merge "Fix bug where 'no results' message sometimes showed momentarily."
2014-11-08 07:46:38 +00:00
d9316ff8dd
Fix bug where 'no results' message sometimes showed momentarily.
...
SearchSession::isComplete() could sometimes return the wrong answer.
Nulling out the continuation is needed to make loadMoreResults()
idempotent. So had to add more state to SearchSession specifically
for tracking completeness.
Change-Id: Ic2a90c73f3a764f358476cffa6d498ea53103421
2014-11-07 23:44:39 -08:00
c03a0f5650
Merge "Help devcam find itself correctly on OS X"
2014-11-07 14:57:45 +00:00
20470f544f
Help devcam find itself correctly on OS X
...
This implements osutil.SelfPath on darwin by trying a $PATH lookup
using the command invocation name. Stops the nagging "couldn't stat
devcam binary" message on OS X.
Change-Id: I42c7f5c30148d810ca753e0812b772db24e93356
2014-11-06 17:30:41 +00:00
8ac319f437
Merge "Fix scrolling on firefox"
2014-11-06 17:25:35 +00:00
0e841e0f51
Rename pkg/misc to pkg/hashutil
...
It only had one function anyway.
Change-Id: Iec4b7868d823148c8e1d2607347fe9d3c1463403
2014-11-06 13:31:58 -03:00
59b6cad0bf
Merge "make main dockerfile build again (add depcheck)"
2014-11-06 16:28:32 +00:00
96bae4b0e2
Fix scrolling on firefox
...
Change-Id: Ic023dba06680f3d4772fe709b7f5f0dd0d54e7ae
2014-11-06 11:04:21 +00:00
4cf29f33d3
ui: added 'No results found' message to blob item container
...
this patch incorporates visual feedback from aaron
Change-Id: Ib7b8bbc7daa958693dafc9b2108cac3ee91bb870
2014-11-06 10:52:47 +01:00
d0fbaa641a
make main dockerfile build again (add depcheck)
...
Change-Id: I7e10e705b84257415a0087617fdfc39fde67f0b1
2014-11-05 15:28:33 +00:00
mpl