Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kelseyhightower/confd
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: forkhome/confd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 15 commits
  • 38 files changed
  • 7 contributors

Commits on Jul 24, 2014

  1. Fix myapp-nginx.tmpl filename

    @philipz
    philipz committed Jul 24, 2014
    Configuration menu
    Copy the full SHA
    180a934 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2014

  1. sort results from etcd so keys are always in the same order

    Bill Hathaway committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    7d77798 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2014

  1. Merge pull request #109 from billhathaway/sortEtcdResults 

    sort results from etcd so keys are always in the same order
    @kelseyhightower
    kelseyhightower committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    e8a5dc3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #106 from philipz/patch-1 

    Fix myapp-nginx.tmpl filename
    @kelseyhightower
    kelseyhightower committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    9b19fe5 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2014

  1. Update consul-getting-started.md 

    Fix doc for calling consul backend.
    @jhmartin
    jhmartin committed Aug 5, 2014
    Configuration menu
    Copy the full SHA
    f92a4c8 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2014

  1. Merge pull request #114 from jhmartin/patch-1 

    Update consul-getting-started.md
    @kelseyhightower
    kelseyhightower committed Aug 6, 2014
    Configuration menu
    Copy the full SHA
    2a5d4a3 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2014

  1. Update deps

    @kelseyhightower
    kelseyhightower committed Aug 8, 2014
    Configuration menu
    Copy the full SHA
    7f5790f View commit details
    Browse the repository at this point in the history

  2. Set DialTimeout in etcd client 

    One second (the default) isn't long enough for many tasks.
    @carmstrong
    carmstrong committed Aug 8, 2014
    Configuration menu
    Copy the full SHA
    ab64315 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #112 from carmstrong/add_dial_timeout 

    Set DialTimeout in etcd client
    @kelseyhightower
    kelseyhightower committed Aug 8, 2014
    Configuration menu
    Copy the full SHA
    e2a25af View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2014

  1. fix(resource.go): try writing to destination when rename fails

    @carmstrong
    carmstrong committed Aug 29, 2014
    Configuration menu
    Copy the full SHA
    0e563e5 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2014

  1. Merge pull request #123 from deis/fix_etc_hosts 

    fix(resource.go): try writing to destination when rename fails
    @kelseyhightower
    kelseyhightower committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    8d8e08e View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2014

  1. Update installation to point to 0.5.0

    Micah Hausler committed Sep 9, 2014
    Configuration menu
    Copy the full SHA
    c473495 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2014

  1. fixes #119 

    "c, err := .... " will override variable "c" defined before.
    @bearice
    bearice committed Sep 17, 2014
    Configuration menu
    Copy the full SHA
    dc4af0a View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2014

  1. Merge pull request #129 from bearice/patch-1 

    fixes #119
    @kelseyhightower
    kelseyhightower committed Sep 18, 2014
    Configuration menu
    Copy the full SHA
    0136805 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #126 from micahhausler/master 

    Update installation docs to point to 0.5.0
    @kelseyhightower
    kelseyhightower committed Sep 18, 2014
    Configuration menu
    Copy the full SHA
    249785b View commit details
    Browse the repository at this point in the history
Loading