Permalink
Commits on Jun 3, 2016
  1. Merge pull request #2322 from SvenDowideit/3june2016-docs-updates

    SvenDowideit committed Jun 3, 2016
    3june2016 docs updates
  2. Merge pull request #2321 from SvenDowideit/aliases-need-to-be-absolute

    SvenDowideit committed Jun 3, 2016
    hugo aliases need to be absolute
    (cherry picked from commit de6f09e)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  3. Merge pull request #2319 from allencloud/fix-typos

    dongluochen authored and SvenDowideit committed Jun 2, 2016
    fix typos
    (cherry picked from commit 43fad5a)
    
    Signed-off-by: Sven Dowideit <[email protected]>
Commits on Jun 1, 2016
  1. Merge pull request #2313 from SvenDowideit/31may2016-docs-updates

    SvenDowideit committed Jun 1, 2016
    31may2016 docs updates
Commits on May 31, 2016
  1. Merge pull request #2292 from SvenDowideit/fix-link

    sfsmithcha authored and SvenDowideit committed May 31, 2016
    fix link
    (cherry picked from commit e69bb29)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  2. Merge pull request #2311 from bedeabza/docs-typos

    allencloud authored and SvenDowideit committed May 31, 2016
    typo: 'loadblancer' in Swarm at scale docs
    (cherry picked from commit 2721be2)
    Signed-off-by: Sven Dowideit <[email protected]>
  3. Merge pull request #2238 from SvenDowideit/Egnine

    dongluochen authored and SvenDowideit committed May 13, 2016
    Small spelling fix
    (cherry picked from commit 07825a1)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  4. Merge pull request #2230 from kolyshkin/patch-1

    dongluochen authored and SvenDowideit committed May 12, 2016
    install-manual: fix sec. swarm manager connect
    (cherry picked from commit c5f33ec)
    Signed-off-by: Sven Dowideit <[email protected]>
  5. Merge pull request #2184 from realityone/fix-reschedule-docs

    dongluochen authored and SvenDowideit committed May 11, 2016
    fix set reschedule policy docs
    (cherry picked from commit 45d2960)
    
    Signed-off-by: Sven Dowideit <[email protected]>
Commits on May 12, 2016
  1. Merge pull request #2229 from SvenDowideit/cherry-pick-docs

    sfsmithcha committed May 12, 2016
    Cherry pick docs
Commits on May 11, 2016
  1. Merge pull request #2215 from joelhandwell/patch-1

    dongluochen authored and SvenDowideit committed May 6, 2016
    Krane project has been closed in favor of Machine
    (cherry picked from commit 34e3da3)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  2. Merge pull request #2211 from nishanttotla/bump-1.2.2-rc1

    nishanttotla authored and SvenDowideit committed May 6, 2016
    Bump version to 1.2.2-rc1
    (cherry picked from commit 372ad21)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  3. Merge pull request #2180 from ogryzek/typo-edits

    dongluochen authored and SvenDowideit committed May 5, 2016
    Edit typos in 'Try Swarm at scale'
    (cherry picked from commit 5925814)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  4. Merge pull request #1978 from troyfontaine/discovery_node_docs

    sfsmithcha authored and SvenDowideit committed May 5, 2016
    Added node discovery warning
    (cherry picked from commit 7ab5695)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  5. Merge pull request #2207 from dongluochen/bump-1.2.1

    dongluochen authored and SvenDowideit committed May 3, 2016
    Bump version to v1.2.1
    (cherry picked from commit 9a968f5)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  6. Merge pull request #2205 from dongluochen/containerslots

    dongluochen authored and SvenDowideit committed May 3, 2016
    Containerslots
    (cherry picked from commit b2de648)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  7. Merge pull request #2072 from allencloud/update-docs-about-kernel-ver…

    sfsmithcha authored and SvenDowideit committed May 3, 2016
    …sion
    
    update docs about kernel version support in production
    (cherry picked from commit e8cb44f)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  8. Merge pull request #2185 from SvenDowideit/use-docs-base-oss

    thaJeztah authored and SvenDowideit committed Apr 29, 2016
    convert docs Dockerfiles to use docs/base:oss
    (cherry picked from commit 31fe617)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  9. Merge pull request #1942 from allencloud/api-response-status-code-com…

    nishanttotla authored and SvenDowideit committed Apr 25, 2016
    …parison
    
    add documentation describing the difference in api response status code.
    (cherry picked from commit e4bab6c)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  10. Merge pull request #2159 from allencloud/fix-and-format-changelog

    nishanttotla authored and SvenDowideit committed Apr 23, 2016
    fix some typos and format CHANGELOG.md
    (cherry picked from commit a8c8eb8)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  11. Merge pull request #2158 from dongluochen/bump-1.2.1rc1

    dongluochen authored and SvenDowideit committed Apr 23, 2016
    bump 1.2.1-rc1
    (cherry picked from commit 584e10c)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  12. Merge pull request #2136 from doronp/Fix_Docs

    dongluochen authored and SvenDowideit committed Apr 19, 2016
    Fix docs
    (cherry picked from commit d9beef7)
    
    Signed-off-by: Sven Dowideit <[email protected]>
  13. Merge pull request #2120 from HackToday/fixtypo

    vieux authored and SvenDowideit committed Apr 15, 2016
    Fix some typo
    (cherry picked from commit 7e69ac3)
    
    Signed-off-by: Sven Dowideit <[email protected]>
Commits on Apr 13, 2016
  1. Merge pull request #2118 from vieux/update_changelog

    vieux committed Apr 13, 2016
    update CHANGELOG.md
  2. Merge pull request #2078 from moxiegirl/fix-swarm-scale-doc

    dongluochen committed Apr 13, 2016
    Swarm at scale with local docker vms
  3. Redoing the example for local machines

    Mary Anthony
    Mary Anthony committed Mar 15, 2016
    Updating images
    Adding in the Compose solution
    Copy edits
    Updating with Dong's comments
    
    Signed-off-by: Mary Anthony <[email protected]>
  4. Merge pull request #2117 from kencochrane/more_typo_fixes

    nishanttotla committed Apr 13, 2016
    Fixed some typos in the docs
  5. Fixed more typos in the docs

    kencochrane committed Apr 13, 2016
    Signed-off-by: Ken Cochrane <[email protected]>
  6. update CHANGELOG.md

    vieux committed Apr 13, 2016
    Signed-off-by: Victor Vieux <[email protected]>
  7. Merge pull request #2115 from vieux/update_to_1.5.4

    vieux committed Apr 13, 2016
    update to go 1.5.4
  8. Merge pull request #2114 from vieux/GOOS_dockerfile

    vieux committed Apr 13, 2016
    Add GOOS buildarg in dockerfile
  9. update to 1.5.4

    vieux committed Apr 13, 2016
    Signed-off-by: Victor Vieux <[email protected]>
  10. Add GOOS buildarg in dockerfile

    vieux committed Apr 13, 2016
    Signed-off-by: Victor Vieux <[email protected]>
Commits on Apr 12, 2016
  1. Merge pull request #2113 from kencochrane/doc_typo_fix

    nishanttotla committed Apr 12, 2016
    Fixed a couple typos in the docs
  2. Fixed a couple typos in the docs

    kencochrane committed Apr 12, 2016
    Signed-off-by: Ken Cochrane <[email protected]>