[lxc-devel] [lxc/lxc] 349fad: [templates] archlinux: resolve conflicting files

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 349fadd6e328c0cfb7e04d4eb2e9ae83ccedf69f
      https://github.com/lxc/lxc/commit/349fadd6e328c0cfb7e04d4eb2e9ae83ccedf69f
  Author: otofune <otofune at gmail.com>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M templates/lxc-archlinux.in

  Log Message:
  -----------
  [templates] archlinux: resolve conflicting files

- already found /etc/localtime
- duplicate creation /etc/resolv.conf

Signed-off-by: otofune <otofune at gmail.com>


  Commit: d720fa1130886b4bf6b6e439504d6c1cea8cfae9
      https://github.com/lxc/lxc/commit/d720fa1130886b4bf6b6e439504d6c1cea8cfae9
  Author: otofune <otofune at gmail.com>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M templates/lxc-archlinux.in

  Log Message:
  -----------
  [templates] archlinux: noneed default_timezone variable

Signed-off-by: otofune <otofune at gmail.com>


  Commit: bb2f4389850bb7f08728c4ce13a4b767e86857dd
      https://github.com/lxc/lxc/commit/bb2f4389850bb7f08728c4ce13a4b767e86857dd
  Author: Stéphane Graber <stgraber at stgraber.org>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M templates/lxc-archlinux.in

  Log Message:
  -----------
  Merge pull request #1463 from armchair-philosophy/up_templates_arch

[templates] archlinux: resolve conflicting files


Compare: https://github.com/lxc/lxc/compare/9b001960dfaf...bb2f4389850b