skydb/sky
Squashed 'astaxie__beego/' changes from 4fc49b5..be92903

be92903 Merge pull request #62 from coderhaoxin/master
4577bfb add git ignore file

git-subtree-dir: astaxie__beego
git-subtree-split: be9290364dcd7cd45c9e4de0849a760356eb29be
Merge commit 'a0e972a7e0f06b1be5afa832f88f711323f7a165'
Squashed 'astaxie__build-web-application-with-golang/' changes from bf1976d..1dfcbc6

1dfcbc6 Merge pull request #205 from yinpeng/master
62850d9 修正go-sql-driver的地址
c2b70a8 Merge pull request #204 from songpeng1997/patch-2
944f304 Merge pull request #203 from songpeng1997/patch-1
bb4c77d Mac OS Sublime setting
77de0ed gvm use + 'default'
ba86a96 Merge pull request #202 from ernix/fix_typo
e2fc048 Fix typo: Emplyee => Employee
d3afa58 Merge pull request #201 from tianyl1984/patch-1
e3fd56e Update 06.2.md

git-subtree-dir: astaxie__build-web-application-with-golang
git-subtree-split: 1dfcbc69d01794527a83a6aee32043bd80d71d62
Merge commit '95cb3d236061b4f661d92c8f6a2a5577464bf4b7'
Squashed 'benbjohnson__go-/' changes from e2cd96f..147d3c5

147d3c5 Switch to use Transporter interface.
9e88344 Remove join command. Fix race condition.
97fbdde Interface clean up.
34008d9 gofmt
345a74b Deny command execution for non-leaders.
7503eee Fix timer cleanup.
1337175 Merge branch 'master' of https://github.com/benbjohnson/go-raft
c80f42a Add random timeouts.

git-subtree-dir: benbjohnson__go-
git-subtree-split: 147d3c5dd8a71a3a69aab616dce40f20145f25c5
Merge commit '6d10560c7e4c50d75bad5cc57275d910c337ce50'
Squashed 'bitly__nsq/' changes from 92bb1d0..da7057d

da7057d Merge pull request #196 from mreiferson/flush_196
af39bd2 Merge pull request #213 from mreiferson/admin_cookie_213
8f71060 nsqadmin: only use the host portion for cookie domain
fb15280 add tests
82be80d nsqd: re-organize command line flags
c2a2e4e nsqd: add client configurable output buffering
cbb334c nsqd: add max_msg_timeout and msg_timeout to IDENTIFY response

git-subtree-dir: bitly__nsq
git-subtree-split: da7057dd3cc0887c383f68667d7bc19c86da6733
Merge commit '46c366e3490db67ac0711cb43d0b72481dc83f88'
Squashed 'davecheney__autobench/' changes from a7e9543..4f579ac

4f579ac Merge pull request #22 from mrkvm/master
f7d2b3f Benchmark numbers on FreeBSD 9.1/AMD64 showing HTTP client/server regression.
d2b28d8 Merge branch 'master' of github.com:davecheney/autobench
b530952 linux/arm rpi benchmarks
77f215b Merge branch 'master' of https://github.com/davecheney/autobench
16acfeb added linux/arm armv5 qnap
de4a285 linux/arm ARMv7 OMAP4
4710adb added linux/arm beagebone black results, /ht @ajstarks
30f59f7 Merge branch 'master' of github.com:davecheney/autobench
0e43428 Added linux/arm chromebook benchmarks
4e0cfe9 Merge branch 'master' of github.com:davecheney/autobench
694d21f remove unneeded patch

git-subtree-dir: davecheney__autobench
git-subtree-split: 4f579ac0990d485550cacf78658a801d4e9d9a32
Merge commit '84eb43a883552c95981d7ca051145dceab5db84a'
Squashed 'dotcloud__docker/' changes from d3b9733..078a19d

078a19d Merge pull request #777 from dotcloud/bsdtar-env
561ceac * Runtime: pass a guaranteed environment to bsdtar for predictable behavior without depending on the underlying host configuration.
a373c77 Merge pull request #707 from unclejack/411-add-arch-field
90b8c5c Merge pull request #762 from dotcloud/761-packaging-dockerbuilder
9bc71c1 Merge pull request #719 from dotcloud/json_stream-feature
926c1d4 Merge pull request #533 from tianon/mkimage-debian
80b8756 Merge pull request #727 from dotcloud/remove_hijack_logs-feature
7d16759 Merge pull request #766 from dotcloud/prevent_attach_stopped_container-feature
76bb920 Merge pull request #753 from dotcloud/registry_api_remove_teams
1ac36a3 Merge pull request #767 from gasi/master
46bdbba Merge pull request #755 from dotcloud/infrastructure2
766a2db Add Daniel Gasienica to AUTHORS
fd0c501 Fix minor documentation error in ‘Running Redis Service’ example
468e4c4 returns an error if the container we want to attach is not running
9eda915 Merge pull request #764 from dotcloud/add_t_parameter_doc_build-fix
2baea24 add -t parameter in the doc
1040225 Packaging: Ensure dockerbuilder can build docker PPA
1c09165 Merge pull request #745 from rogaha/doc_ssh_service_example_uptd
8d73740 Bumped version to 0.3.4
a148301 + Runtime: 'docker build' builds a container, layer by layer, from a source repository containing a Dockerfile + Runtime: 'docker build -t FOO' applies the tag FOO to the newly built container.
bd38b47 bump to master
caaea2e * Build: never remove temporary images and containers
de7ce7c Merge pull request #752 from dotcloud/victor_maintainer
c903a6b * Builder: keep temporary images after a build fails, to allow caching
4205b6b Merge branch 'master' into builder_server-2
ca64090 Merge pull request #749 from dotcloud/unit_tests_use_available_port-fix
459a286 Merge pull request #741 from dotcloud/split_stdout_stderr_run-feature
28d5b2c Update docker build docs
43f369e Organize the project infrastructure: servers, dns, email etc.
6d2e3d2 Fix issue with CMD instruction within docker build
a4e6025 Deprecate INSERT and COPY
56431d3 Add -t to docker build in order to tag resulting image
5324614 Merge pull request #747 from riccieri/patch-1
531b301 Remove special case for 'teams' from registry api
fc78895 Make Victor Vieux a core maintainer
2ed1092 * Documentation: removed 'building blocks' for now.
cd002a4 ensure progress downloader is well formated
194fca8 Merge pull request #750 from dotcloud/ensure_order_help-fix
2c14d39 always display help in the same order
2a53717 if address already in use in unit tests, try a different port
97247c5 'docker build': remove INSERT command (should add support for remote sources in ADD instead)
b2084a9 Add IP forwarding config to archlinux guide
9a39404 Fix issue with mkdir within docker build
fc864d2 Simplified syntax of 'docker build': 'docker build PATH | -'
dcab408 Fixed phrasing, typos and formatting in 'docker build'
faafbf2 Fix ADD behavior on single files
881fdc5 Remove cache opti that cause wrong cache miss
560a74a Fix cache miss issue within docker build
b6165da Create a layer for each operation (expose, cmd, etc)
ae0d555 Fix autorun issue within docker build
7ff2e6b Merge branch 'master' of ssh://github.com/dotcloud/docker
9293956 Update build doc
d97fff6 Update docker build docs
33ea148 Allow docker build from stdin
c7af917 updated the running ssh service example with the video's transcription
6cbc775 Fix issue with unknown instruction within docker build
75d2244 Update docker build UI
08e5f12 Merge pull request #739 from dotcloud/push_issue-1
e33ba9b split stdout and stderr in run if not -t
a5fe6f8 Merge branch 'master' into split_stdout_stderr_run-feature
f339fc2 bump to master
8f829eb Merge pull request #740 from dotcloud/ps_output-fix
044bdc1 fix ps output
c00d1a6 improve attach
11550c6 Removed debug output in 'docker version'
dc1fa07 Improved wording of a maintainer's responsibilities
3bac27f Fixed formatting of CONTRIBUTING.md
286ce26 allmaintainers.sh: print a flat list of all maintainers of a directory (including sub-directories)
aa42c6f Added Victor and Daniel as maintainers for api.go and Vagrantfile, respectively
7181edf getmaintainer.sh: parse MAINTAINERS file to determine who should review changes to a particular file or directory
c798580 + Runtime: stable implementation of 'docker build'
83db1f3 Merge branch 'master' of ssh://github.com/dotcloud/docker
24ddfe3 Documented who decides what and how.
b76d612 Update tests with new cookies for registry
cd0de83 Cereate a new registry object for each request (~session)
e84306c Merge pull request #730 from dotcloud/invert_status_created-fix
f653275 Merge pull request #731 from dotcloud/change_containersPs_containersJson_api-feature
7aa0d11 Merge pull request #732 from dotcloud/718-return_no_such_container_as_404-fix
54af053 Make sure the last line of docker build is the image id
5b33b24 Readd build tests
2127f8d Fill the multipart writer directly instead of using reader
2897cb0 Add directory contents instead of while directory for docker build
fe0c0c2 Send error without headers when using chunks
522f399 Merge branch 'master' of ssh://github.com/dotcloud/docker
326faec De-duplicated contribution instructions. The authoritative instructions are in CONTRIBUTING.md at the root of the repo.
28a30ed Merge pull request #702 from kim0/patch-2
387eb52 Removed deprecated SPECS directory
f3cc1d9 Merge pull request #733 from meejah/master
cfb8cbe Small fix
582a9e0 Make docker build flush output each line
a487990 Fix merge issue
dce82bc Merge master
90ffcda Update the UI for docker build
6ae3800 Implement the CmdAdd instruction
54db186 Add Extension() method to Compresison type
235ae9c Merge pull request #709 from dhrp/links-to-kernel-doc
444f702 Add sudo to commands.
5250801 Use Ubuntu's built-in method to add a PPA repository, which correctly handles keys for you.
e5fa4a4 return 404 on no such containers in /attach
4f94439 rename containers/ps to containers/json
8699805 documentation
d9670f4 invert status created
3d8da80 Merge pull request #729 from mmcgrana/fix-attach-api-docs
7d6ff7b Fix attach API docs.
fbcd850 remove hijack on the client in logs, and split stdout / stderr
5a36efb fix json encoding, and use less casts
1421293 ensure valid json
c8c7094 imporved error, push, import insert
cb0bc4a add error handling
5f69a53 set architecture to x86_64 by default
c5f15dc Added links to @jpetazzo 's kernel article, removed quote indents from puppet.rst
2cf92ab add arch field to image struct
4e576f0 Properly install ppa, avoid GPG key warning
2cd00a4 remove unused function
e3f0429 Add missing buildfile.go
d42c10a Implement Context within docker build (not yet in use)
0f135ad Start moving the docker builder into the server
2f89315 Update mkimage-debian.sh now that wheezy is officially the stable release - also, we can't rely on "release" versions for testing or unstable - only "stable" has reliable release versions

git-subtree-dir: dotcloud__docker
git-subtree-split: 078a19d7255a7f9f50c4071a6b0811f4a996bd3e
Merge commit '6498909c9dd757e5bd2411238af0aa97626e45d7'
Squashed 'eaigner__hood/' changes from 8c36aa9..9fa5bd9

9fa5bd9 Merge pull request #62 from redneckbeard/update-postgres-driver
52608a1 Change import path for postgres driver to use currently maintained version.

git-subtree-dir: eaigner__hood
git-subtree-split: 9fa5bd9763f51fc7b4fd2c1f2b673d83d37f414a
Merge commit 'c88e0d058ee0e6d30cab826f110ec7bcc759ce55'
Squashed 'globocom__tsuru/' changes from 562ba5c..7bb363f

7bb363f api: use launchpad.net/goyaml instead of the branch beta
3751afd app: use launchpad.net/goyaml instead of the branch beta
a5220c1 provision/juju: using launchpad.net/goyaml instead of the beta branch
97cf494 app/loadConf: removed warning when app.conf does not exist.
60fa6ed fixed func name in comment.
3549f97 provision/docker/provisioner.go: passing app name to route.UnsetCName call
9bf8636 router: receiving app name in UnsetCName method
92de171 router/hipache: storing cname and appname in redis.
9f4694e provisioner/docker: created UnsetCName method on provisioner
ef9b1ba router: s/AddCName/SetCName/g
5eec655 router: removing address parameter from UnsetCName
3afdd18 router/hipache: removing all cname records instead of only one specific address
f0aa984 router: s/RemoveCName/UnsetCName/g
26afc16 router/testing/router.go: added mutex in AddCName method
03c89d0 provision/provision.go: Created CNameManager interface
957684b provision/docker/provisioner*: adding SetCName method
3872c9b router/testing: implementing cname functions
f88e6e2 router: s/CNAME/CName to follow standard in app package
5bfde5b api: require tsuru 0.8.1.
32c3db9 api: require crane 0.5.1.
0217e16 api: require tsuru-admin 0.2.1.
66cbeaa cmd/tsuru: version 0.8.1.
e577829 cmd/tsuru-admin: version 0.2.1.
5216367 cmd/crane: version 0.5.1.
bef98c3 fixed validateVersion.
a83d9d2 api: require tsuru-admin 0.2
a8d9646 api: require crane 0.5
fa5e4c3 api: require tsuru 0.8
2cc5028 cmd/crane: version 0.5
6ecf1f6 cmd/tsuru-admin: version 0.2
2452bc3 cmd/tsuru: version 0.8
0cc2536 update docs to use enviroment for set app port.
a4eea9b cmd: improve error message for undefined targets
ed92c7a cmd: register topic for target management
1b617ad cmd: improve output for naked help calls
a213f02 cmd: include topics in the output for the naked call
e35e524 cmd: add support for topics in the help command
f51760c cmd: fix "Error:" duplication in help output when command doesn't exist
8c5c997 cmd: add method RegisterTopic to Manager
8ae7e42 docs: fixing faq title
b608adb router/hipache/router.go: setting frontend outside loop
68941bd cmd/tsuru: version 0.7.17
2de9078 cmd/tsuru-admin: version 0.1.10
5cecfdf docs/faq: fix sphinx warning
e7ed34a cmd/crane: version 0.4.7
47b8691 cmd: fix error message for undefined targets
2c47dc7 docs/faq: some formatting and text changes
a7320d6 docs/faq: add entry related to the "undefined: bufio.Scanner" message
5a33777 docs/install/client: add note regarding Go 1.1 requirement
67f55fe cmd/tsr: copy configuration file used in tests
0a706af cmd/tsr: remove dead code

git-subtree-dir: globocom__tsuru
git-subtree-split: 7bb363f9270dc156f4d40be19e5c8bda4c83e5e4
Merge commit '9fbb91aa887a8855c9d309bc4106333e3b312348'
Squashed 'jordansissel__lumberjack/' changes from 9b3ea13..aa6a89a

aa6a89a Merge pull request #54 from webmat/copy_paste_friendly_readme
a44748c Merge pull request #53 from webmat/fix_bundler_warning
4cfef31 Fix a typo
a474438 Make the readme more copy/paste friendly :-)
71e4627 Fix bundler warning about http rubygems access

git-subtree-dir: jordansissel__lumberjack
git-subtree-split: aa6a89a372a93d2fd0b93e447c8ad032177df74b
Merge commit 'f221ae82a89025b948f41b36e15a21b526730307'
Squashed 'mjibson__goread/' changes from db879ad..a370bdd

a370bdd Pass the whole feed object
de6e3c6 Revert, didn't work
fb82049 Manual feed updating
e239f34 Sort
9addaed Date format
3cd23d5 Some feed debug output
96025df Try increasing the urlfetch timeout to 60
54fea6f Date format
502bb9f Demote to warning

git-subtree-dir: mjibson__goread
git-subtree-split: a370bdd493c4eca22d589e1281197475e603e4f7