https://github.com/spf13/hugo.git
Squashed 'github.com/spf13/hugo/' content from commit 8d50dd9

git-subtree-dir: github.com/spf13/hugo
git-subtree-split: 8d50dd9160e17865e86b1fbf9a89efcba2bd8c29
Merge commit '1f86a7bdaaf8c5a91caac25b0b9e20e46940d30b' as 'github.com/spf13/hugo'
Squashed 'github.com/ant0ine/go-json-rest/' changes from f9e9207..aa4b939

aa4b939 Fix issue #23 where the query string was passed to the trie query.
ffb76f0 Add a test to reproduce the issue #23

git-subtree-dir: github.com/ant0ine/go-json-rest
git-subtree-split: aa4b9394938dc66c5102f2016a69c49e0f4ea5ed
Merge commit 'da9c54cf0a34567af6d766e1bf81aa26b5ca01f6'
Squashed 'github.com/astaxie/beego/' changes from b2abb4e..6020068

6020068 fix setcookie time type
af3797e Merge pull request #93 from Unknwon/master
d4743fb Sync documentation of English with Chinese version
38b083e add docs about how to write api application
fece5ad add example for api application
7bfb412 support copy requestbody
2abe584 support restful router
ee9223b fix #18
d2a16ff fix #26 add xsrf function
f1e5059 fix #69 refer to http://www.php.net/manual/zh/function.setcookie.php
11977f4 fix #90
461eac4 fix #89
75af664 change r.ParseMultipartForm  position
174298b fix cache's bug expird is not changed by get method
9b392a0 update to hotupdate's connet timeout
bf9de3b add HttpServerTimeOut   setting
189df12 fix #87
8807c32 fix log delete
d627ec0 add config to countol if enable hotupdate
d0bbc67 Merge pull request #86 from slene/master
4535579 fix logrotate close fd before rename file, add a MuxWriter for Logger
4033692 Merge pull request #85 from Unknwon/master
236f28c sync quickstart.
b2bfed8 fix close err
71adbdd add mutex
573df2e add isclose call close many times
aa9cb6d delete session's cookie Expires
8358e0f Merge pull request #83 from shxsun/master
1687ec8 fix build problem
d5fc0a4 Merge pull request #82 from matrixik/master
3bcff77 Change: SetRotateMaxDay => SetRotateMaxDays
1521842 add static global function & add seocms example
b04813e fix #80
9e41d93 delete strcut map
309f2e1 add tag to 0.7.0
26baf0f update docs for logs & DirectoryIndex
23ff422 if exist file then read lines err
d99ae3e add logrotate's setting for rotate
4b09175 fix error info tempalte's title
512ddf8 fix small bug for not return
73d45b1 log support file & logrotate
c5a23d5 fix #81
3578bb3 fix bug substr
40c7b47 Merge pull request #76 from matrixik/patch-1
f56e773 Update: README
86ddfe5 Merge pull request #75 from matrixik/master
1c4d0d7 Update: supervisord en docs
20e101a Merge pull request #74 from matrixik/master
10417dd Update: clean and fix README markdown
541d7f7 Update: clean and fix docs markdown
fdb94ae Fix: install en docs links
67511de Merge pull request #73 from matrixik/master
43f588b Fix: session README
cc6c84b Update: session README
b68a37a Some updates to cache README
b886ed5 Update cache docs
3475685 add Server info
0abe3e2 add build status
25cf081 Merge pull request #72 from Unknwon/master
28d0738 doc_en:hot update
6a260ca Merge pull request #71 from yecrane/master
27896c5 Update controller.go
384fa8f Merge pull request #70 from luw2007/luw2007
5d531d3 fix jsonp, use Buffer
ea756b6 Merge pull request #68 from luw2007/luw2007
06e002c feture: add jsonp
73f0f4f Merge pull request #59 from lunny/master
f20ad09 bug fix
65041aa remove nonuse parseForm and change the StructMap's params
8b7cba0 add url params -> controller's member feature
2dee301 add structmap function for controller

git-subtree-dir: github.com/astaxie/beego
git-subtree-split: 60200689f46998c2f382f3887d6a4dea231b70d6
Merge commit 'c8519fe7b1edab1fd8f619bc220818c59cc6572d'
Squashed 'github.com/astaxie/build-web-application-with-golang/' changes from 215efca..9a35ff8

9a35ff8 Merge pull request #221 from qinhanlei/patch-5
cf53003 Update 06.2.md
f726c34 Merge pull request #220 from qinhanlei/patch-4
1cba709 Update 05.6.md
e711a01 fix bbs url
132424e Merge pull request #219 from qinhanlei/patch-3
f79b575 Update 05.4.md
c8e7009 Merge pull request #218 from qinhanlei/patch-2
1cce49f Update 05.1.md
8678746 Merge pull request #217 from wyh267/master
d67975c 修改了genepub.sh
bcaf5c6 Merge pull request #216 from qinhanlei/patch-1
ef435ed Update 04.2.md
dbf185a Merge pull request #214 from turristan/master
087222f 简化Linux系统架构的识别
63fc856 Merge pull request #213 from sevensmall/patch-2
7836487 修改日文你好的英文字母
1b53bd9 Merge pull request #212 from sevensmall/patch-1
7001600 修改日文hello world
98cfc45 更新源码到1.1.1版本
995a785 fix #192
563046f fix #196
b012bf3 fix #208
12dd71e fix #210

git-subtree-dir: github.com/astaxie/build-web-application-with-golang
git-subtree-split: 9a35ff8069952f22ce6e0387a13c470d6514a253
Merge commit '296cfc8391097e3575ace26bc05d6a49f1cca62b'
Squashed 'github.com/benbjohnson/go-raft/' changes from f9ec2ed..c0c294e

c0c294e Merge pull request #70 from coreos/master
255ce1b add NOPCommand.go
2abebe3 refactor
b9e1da8 let knowen peer to rejoin to the cluster
d0da319 Merge https://github.com/benbjohnson/go-raft
75e0a22 commit a NOP after the server becomes leader. Commit ohter commands, after the majority of the peers synced by the NOP command
f37954c Merge pull request #68 from waffleio/master
a87bf88 add waffle.io badge
044ab0f Merge pull request #67 from benbjohnson/append-entries-benchmarking
cdf5425 Reset timer on benchmarks.
645a103 go fmt
459c84b Merge pull request #66 from benbjohnson/append-entries-benchmarking
628b86f Add throughput metrics to benchmark.
df0c7ef Convert encoding/decoding tests to benchmarks.
8f030b5 Merge pull request #65 from benbjohnson/fix-candidate-loop-state-check
2ee061c Fix state check in candidate inner loop.
da98ea0 Merge pull request #64 from coreos/master
62ddd37 add encoding speed test and gofmt
7cfb6f5 Merge pull request #63 from benbjohnson/http-transporter
67d11f7 Remove trace logging.
6ce3a6c Use client.Post().
5e71312 HTTP Transporter fixes.
4ee2054 Merge branch 'master' of https://github.com/benbjohnson/go-raft into http-transporter
5aa494d Add HTTPTransporter.
1c4b918 Merge pull request #62 from coreos/master
3392f81 Remove the lock in init(). Since addPeer func() require that lock. When do log replay in the init(), there will be deadlock
1157ef0 Merge pull request #61 from coreos/master
9efa791 record the value of the commit result before remvoe it
b3e7f49 do not send commit signal if it came from old leader
271a734 Merge pull request #60 from coreos/master
7178b21 create new channel before start heartbeat to avoid recv stop signal from old heartbeat func
c5bebba Merge pull request #59 from coreos/master
53d43de fix election timeout problem
d309819 Merge pull request #57 from xiangli-cmu/master
e045441 fix peer stop channel problem
e7e96e5 Merge pull request #56 from xiangli-cmu/master
46dd6bb when change the state to leader, we should also update the s.leader to its own name
fa3ec69 fix break in select
347a27e Merge pull request #55 from xiangli-cmu/master
d3787f6 when candidate stepdown it should break the loop; gofmt
7845ebd Merge pull request #54 from xiangli-cmu/master
6c6c76b [Fix #52] Detect new leader with same term as candidate in processAppendEntriesRequest
ecf3306 Merge https://github.com/benbjohnson/go-raft
77e2d43 Merge pull request #52 from benbjohnson/50-server-event-loop
00d1098 Retrieve peer index and term before verifying server state in heartbeat.
107888a Pass race detector.
743b684 gofmt
08e2d51 Refactor server event loop.
85bedaa Merge pull request #1 from xiangli-cmu/server
ce3dbb5 Server clean up.
0dd663e Merge pull request #48 from benbjohnson/47-external-interface-cleanup
44f3ef6 [Fix #47] Clean up external interface.
72d2d09 Merge pull request #45 from xiangli-cmu/server
5f64d15 change > to >=. > will cause panic when resp.CommitIndex equals prevLogIndex
cbceb05 add server state mutex to avoid state race condition
102c93b Merge pull request #42 from xiangli-cmu/server
fe55d87 server should not be blocking will holding the lock
97d60f6 reduce one gorotine to select in peer.go flush()
5c5b489 rafactor server.go
95d369e init the log entries.
d3f5d2b timeout for transfere. This helps when the node is far left behind. The server will not wait for sending a large package before send the other heartbeat
41d9f53 Merge pull request #40 from xiangli-cmu/server
11de59f after stepdown candidate should return from collectvote and restart election timeout
8b8791e Merge pull request #39 from xiangli-cmu/server
8844583 close debugging
c87fa96 make stepdown blocking
73aa2c5 Merge pull request #38 from xiangli-cmu/master
7a19090 change log ouput format to Lmicroseconds
4903668 Merge pull request #36 from xiangli-cmu/master
c9ce5b4 when promoted, election timeout should be stopped
24a78bc Merge pull request #34 from xiangli-cmu/master
24fe106 clean up server_test.go
dac7811 non-blocking sending votes
a6a3f76 clean up promote
73c1726 Merge pull request #33 from xiangli-cmu/master
a3e02e8 snapshot checksum in hex
a48505b clean up
3c15b12 clean up println
521e3d7 Merge https://github.com/benbjohnson/go-raft
4f24fb7 check checksum before load snapshot
1dcaef3 Merge pull request #32 from xiangli-cmu/master
b0eaf97 we have pass the server pointer to the command, dont need to return index
372b840 Merge https://github.com/benbjohnson/go-raft
4c13a40 return command index in do(); add checking in peer.go; gofmt
5c6766e return the index of the commited command to the application via do() and add Index func to get the current committed index of the server
82ccc09 Merge pull request #27 from xiangli-cmu/master
52f97d0 change init count val to 1 in func commitCenter()
aa76606 fix three promote test
4f99952 Merge remote-tracking branch 'benbjohnson/master'
941720f gofmt
1272a1c add commit about fire at peer when leader has new commit index
7a58a3e candidate should also start election timeout when stepdown; At least one entry from the leader's current term must also be stored on
a69c3f4 Merge pull request #25 from xiangli-cmu/master
0ff7040 delete panic in setCommitIndex
9597f80 receive older committed index should not be error
938b649 Minor Timer refactor.
430b2eb clean up codes
e1fd7e4 close debug and clean println
8bc79aa gofmt
0fab228 clean up timer and change heartbeat and election to the new timer
b9e1bdc Remove commitNotify().
e09c874 Clean up commitCenter().
0bd3c9b Remove unnecessary server locks.
46fb02f Add s.Peers() and peer cloning.
ff349bb Remove s.Peers().
865da11 Log clean up.
faeaa88 Clean up Peer.flush().
b3dd521 Fix TestLogExistingLog.
0aa9a8d Fix TestLogEntryUnmarshal.
2cf93fd Clear reference to LogEntry.result after return.
e526ed3 Convert LogEntry.result to interface type.
8f81046 Add some padding to the entry's commit channel.
b80b7c5 Add debug mode.
dbcb144 Merge branch 'master' of https://github.com/xiangli-cmu/go-raft into xiangli-master
00fb080 add comments and gofmt
2bc3845 fix issues, further cleaning is needed
d8884cb change the do struct and add commit center
730cdd4 Merge pull request #20 from temoto/patch-1
494bf7e server.MemberCount: synchronize access to .peers map with mutex
19ad975 server.MemberCount: count peers with len() is cheaper than loop
5bef656 when the leader fails in during the collecting response phase, let it step down
f294f3c fix snapshot
3b73c41 election new leader and rejoin works
531e121 add timer.fire function, which can fire at the timer channel
094e77f use heartbeat to flush the new command in do() function and keep the response result in the log entry

git-subtree-dir: github.com/benbjohnson/go-raft
git-subtree-split: c0c294e397f99b866414d976213e313b3495079e
Merge commit '3543033b30b46cdfb1fd83fc509be34243a32f8c'
Squashed 'github.com/bitly/nsq/' changes from ebf8d10..157e5d7

157e5d7 bump to 0.2.22-alpha (update changelog)
86b15f9 Merge pull request #228 from mreiferson/lookupd_dead_228
cd98c64 nsqadmin: display tombstone information on /nodes
f3485b8 nsqlookupd: add tombstone information to /nodes
dd3b053 nsqlookupd: make Registrations non-pointer
466af2d fix travis image to filter to master
7af1b27 Merge pull request #216 from jehiah/empty_files_216
ec2cf05 fix cases that caused empty files
e4ee917 Merge pull request #225 from mreiferson/travis_225
663fda3 nsqd: de-flake output buffering test (again)
d6087d8 run travis tests on 1.0.3 and 1.1.1
eb7a0d0 add go1.1.1 builds of 0.2.21

git-subtree-dir: github.com/bitly/nsq
git-subtree-split: 157e5d7385318b019ad3b29ec2402b8d407dacdc
Merge commit '1cf5f8d1f1c5cb326afa37e220d7cb8fc02007ad'
Squashed 'github.com/buger/gor/' changes from 83f1694..85b5462

85b5462 Removed unused debugging. Refactored variable names.
97a5e99 Updated version
9490c74 Update README.md
bc65507 Merge pull request #10 from buger/use_tcp
203f282 Fixed buffer sharing
88cb352 Removed unused debugging
2ba6dac Remove binary
8defc20 Updated README
76e5981 Proper conn closing and settings refactoring
5910409 Used TCP instead of UDP

git-subtree-dir: github.com/buger/gor
git-subtree-split: 85b54627ae3f94c0e96a7f30b6de23993435c557
Merge commit '1658735fa6f957724e17281105bac146479ad558'
Squashed 'github.com/cloudfoundry/gorouter/' changes from d186c6f..f31b46a

f31b46a regen mock cf message bus
98c968e set up message bus logger
6863399 update README for new repo layout
8636d34 remove bin/{env,go,test}
884e96c add 'go get' step to .travis.yml
6e0da1c restructure repo
2249248 update README.md for new route registration scheme
37e63d0 send router.start when reconnecting to NATS
5c09ae1 move to cloudfoundry yagnats

git-subtree-dir: github.com/cloudfoundry/gorouter
git-subtree-split: f31b46a85876b09df71b1613717f7503f3ddbd00
Merge commit 'b098e64a5ea375d1d9d3fd180dcfb25d382dd4b2'
Squashed 'github.com/crowdmob/goamz/' changes from f107984..35d51f1

35d51f1 Merge pull request #5 from hailocab/gofmt
7fedd7b Gofmt all the things
7c28e23 merge in github.com/flaviamissi/go-elb with cloudfront changes
e1ab1b4 Merge https://github.com/flaviamissi/go-elb
7168305 Merge pull request #4 from bbangert/master
ee98fa3 Expose the service used for mocking.
b67889f Merge pull request #3 from bbangert/master
ca7572e Add PutMetricData implementation.
b4028c9 Simplify error representation.
813d3fe Fix struct typo for proper XML unpacking.
e2ec53b Parse the host only once for the signer. Propagate errors back up for signer.
79c0c74 Fix error handling. Actually store the service info on the service as well.
e8b78a8 Remove signing as we use the built-in. Update cloud watch to use more of the new aws core.
7a41967 Params helper func.
143dfb0 Setup basic structs for additional base functionality to be provided by AWS. Create interfaces to represent the signers and AWS service (for mock-ability). Refactor regions into separate file. Add Cloudwatch endpoints to regions, with signer info. Add V2 signer to AWS core. Implement an AWS Service for basic querying and error building.
dd10248 Initial structure of Cloudwatch components.
33d7910 Add cloud watch endpoints. Add some basic AWS objects.

git-subtree-dir: github.com/crowdmob/goamz
git-subtree-split: 35d51f1ea2add1012752f9d0b364c1bbdda223a7
Merge commit 'e3ea7ab060dc8c4e418fae8db96b734596cedf78'
Squashed 'github.com/d2fn/gopack/' changes from 7424ba9..aed2445

aed2445 Update README.md

git-subtree-dir: github.com/d2fn/gopack
git-subtree-split: aed2445072e22cbcf8d83ad32b6a4c24b95484c0